diff --git a/src/emu/sound/2151intf.c b/src/emu/sound/2151intf.c
index 6fe00529a16..abb06558fdf 100644
--- a/src/emu/sound/2151intf.c
+++ b/src/emu/sound/2151intf.c
@@ -26,14 +26,14 @@ struct ym2151_info
 static void ym2151_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ym2151_info *info = param;
-	YM2151UpdateOne(info->chip, buffers, length);
+	ym2151_update_one(info->chip, buffers, length);
 }
 
 
-static STATE_POSTLOAD( ym2151_postload )
+static STATE_POSTLOAD( ym2151intf_postload )
 {
 	struct ym2151_info *info = param;
-	YM2151Postload(machine, info->chip);
+	ym2151_postload(machine, info->chip);
 }
 
 
@@ -53,14 +53,14 @@ static void *ym2151_start(const char *tag, int sndindex, int clock, const void *
 	/* stream setup */
 	info->stream = stream_create(0,2,rate,info,ym2151_update);
 
-	info->chip = YM2151Init(sndindex,clock,rate);
+	info->chip = ym2151_init(sndindex,clock,rate);
 
-	state_save_register_postload(Machine, ym2151_postload, info);
+	state_save_register_postload(Machine, ym2151intf_postload, info);
 
 	if (info->chip != 0)
 	{
-		YM2151SetIrqHandler(info->chip,info->intf->irqhandler);
-		YM2151SetPortWriteHandler(info->chip,info->intf->portwritehandler);
+		ym2151_set_irq_handler(info->chip,info->intf->irqhandler);
+		ym2151_set_port_write_handler(info->chip,info->intf->portwritehandler);
 		return info;
 	}
 	return NULL;
@@ -70,138 +70,138 @@ static void *ym2151_start(const char *tag, int sndindex, int clock, const void *
 static void ym2151_stop(void *token)
 {
 	struct ym2151_info *info = token;
-	YM2151Shutdown(info->chip);
+	ym2151_shutdown(info->chip);
 }
 
 static void ym2151_reset(void *token)
 {
 	struct ym2151_info *info = token;
-	YM2151ResetChip(info->chip);
+	ym2151_reset_chip(info->chip);
 }
 
 static int lastreg0,lastreg1,lastreg2;
 
-READ8_HANDLER( YM2151_status_port_0_r )
+READ8_HANDLER( ym2151_status_port_0_r )
 {
 	struct ym2151_info *token = sndti_token(SOUND_YM2151, 0);
 	stream_update(token->stream);
-	return YM2151ReadStatus(token->chip);
+	return ym2151_read_status(token->chip);
 }
 
-READ8_HANDLER( YM2151_status_port_1_r )
+READ8_HANDLER( ym2151_status_port_1_r )
 {
 	struct ym2151_info *token = sndti_token(SOUND_YM2151, 1);
 	stream_update(token->stream);
-	return YM2151ReadStatus(token->chip);
+	return ym2151_read_status(token->chip);
 }
 
-READ8_HANDLER( YM2151_status_port_2_r )
+READ8_HANDLER( ym2151_status_port_2_r )
 {
 	struct ym2151_info *token = sndti_token(SOUND_YM2151, 2);
 	stream_update(token->stream);
-	return YM2151ReadStatus(token->chip);
+	return ym2151_read_status(token->chip);
 }
 
-WRITE8_HANDLER( YM2151_register_port_0_w )
+WRITE8_HANDLER( ym2151_register_port_0_w )
 {
 	lastreg0 = data;
 }
-WRITE8_HANDLER( YM2151_register_port_1_w )
+WRITE8_HANDLER( ym2151_register_port_1_w )
 {
 	lastreg1 = data;
 }
-WRITE8_HANDLER( YM2151_register_port_2_w )
+WRITE8_HANDLER( ym2151_register_port_2_w )
 {
 	lastreg2 = data;
 }
 
-WRITE8_HANDLER( YM2151_data_port_0_w )
+WRITE8_HANDLER( ym2151_data_port_0_w )
 {
 	struct ym2151_info *token = sndti_token(SOUND_YM2151, 0);
 	stream_update(token->stream);
-	YM2151WriteReg(token->chip,lastreg0,data);
+	ym2151_write_reg(token->chip,lastreg0,data);
 }
 
-WRITE8_HANDLER( YM2151_data_port_1_w )
+WRITE8_HANDLER( ym2151_data_port_1_w )
 {
 	struct ym2151_info *token = sndti_token(SOUND_YM2151, 1);
 	stream_update(token->stream);
-	YM2151WriteReg(token->chip,lastreg1,data);
+	ym2151_write_reg(token->chip,lastreg1,data);
 }
 
-WRITE8_HANDLER( YM2151_data_port_2_w )
+WRITE8_HANDLER( ym2151_data_port_2_w )
 {
 	struct ym2151_info *token = sndti_token(SOUND_YM2151, 2);
 	stream_update(token->stream);
-	YM2151WriteReg(token->chip,lastreg2,data);
+	ym2151_write_reg(token->chip,lastreg2,data);
 }
 
-WRITE8_HANDLER( YM2151_word_0_w )
+WRITE8_HANDLER( ym2151_word_0_w )
 {
 	if (offset)
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 	else
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 }
 
-WRITE8_HANDLER( YM2151_word_1_w )
+WRITE8_HANDLER( ym2151_word_1_w )
 {
 	if (offset)
-		YM2151_data_port_1_w(machine,0,data);
+		ym2151_data_port_1_w(machine,0,data);
 	else
-		YM2151_register_port_1_w(machine,0,data);
+		ym2151_register_port_1_w(machine,0,data);
 }
 
-READ16_HANDLER( YM2151_status_port_0_lsb_r )
+READ16_HANDLER( ym2151_status_port_0_lsb_r )
 {
-	return YM2151_status_port_0_r(machine,0);
+	return ym2151_status_port_0_r(machine,0);
 }
 
-READ16_HANDLER( YM2151_status_port_1_lsb_r )
+READ16_HANDLER( ym2151_status_port_1_lsb_r )
 {
-	return YM2151_status_port_1_r(machine,0);
+	return ym2151_status_port_1_r(machine,0);
 }
 
-READ16_HANDLER( YM2151_status_port_2_lsb_r )
+READ16_HANDLER( ym2151_status_port_2_lsb_r )
 {
-	return YM2151_status_port_2_r(machine,0);
+	return ym2151_status_port_2_r(machine,0);
 }
 
 
-WRITE16_HANDLER( YM2151_register_port_0_lsb_w )
+WRITE16_HANDLER( ym2151_register_port_0_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM2151_register_port_0_w(machine, 0, data & 0xff);
+		ym2151_register_port_0_w(machine, 0, data & 0xff);
 }
 
-WRITE16_HANDLER( YM2151_register_port_1_lsb_w )
+WRITE16_HANDLER( ym2151_register_port_1_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM2151_register_port_1_w(machine, 0, data & 0xff);
+		ym2151_register_port_1_w(machine, 0, data & 0xff);
 }
 
-WRITE16_HANDLER( YM2151_register_port_2_lsb_w )
+WRITE16_HANDLER( ym2151_register_port_2_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM2151_register_port_2_w(machine, 0, data & 0xff);
+		ym2151_register_port_2_w(machine, 0, data & 0xff);
 }
 
-WRITE16_HANDLER( YM2151_data_port_0_lsb_w )
+WRITE16_HANDLER( ym2151_data_port_0_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM2151_data_port_0_w(machine, 0, data & 0xff);
+		ym2151_data_port_0_w(machine, 0, data & 0xff);
 }
 
-WRITE16_HANDLER( YM2151_data_port_1_lsb_w )
+WRITE16_HANDLER( ym2151_data_port_1_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM2151_data_port_1_w(machine, 0, data & 0xff);
+		ym2151_data_port_1_w(machine, 0, data & 0xff);
 }
 
-WRITE16_HANDLER( YM2151_data_port_2_lsb_w )
+WRITE16_HANDLER( ym2151_data_port_2_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM2151_data_port_2_w(machine, 0, data & 0xff);
+		ym2151_data_port_2_w(machine, 0, data & 0xff);
 }
 
 
diff --git a/src/emu/sound/2151intf.h b/src/emu/sound/2151intf.h
index 87b1e3e33b8..16e05140093 100644
--- a/src/emu/sound/2151intf.h
+++ b/src/emu/sound/2151intf.h
@@ -1,5 +1,7 @@
-#ifndef YM2151INTF_H
-#define YM2151INTF_H
+#pragma once
+
+#ifndef __2151INTF_H__
+#define __2151INTF_H__
 
 typedef struct _ym2151_interface ym2151_interface;
 struct _ym2151_interface
@@ -8,31 +10,33 @@ struct _ym2151_interface
 	write8_machine_func portwritehandler;
 };
 
-READ8_HANDLER( YM2151_status_port_0_r );
-READ8_HANDLER( YM2151_status_port_1_r );
-READ8_HANDLER( YM2151_status_port_2_r );
+READ8_HANDLER( ym2151_status_port_0_r );
+READ8_HANDLER( ym2151_status_port_1_r );
+READ8_HANDLER( ym2151_status_port_2_r );
 
-WRITE8_HANDLER( YM2151_register_port_0_w );
-WRITE8_HANDLER( YM2151_register_port_1_w );
-WRITE8_HANDLER( YM2151_register_port_2_w );
+WRITE8_HANDLER( ym2151_register_port_0_w );
+WRITE8_HANDLER( ym2151_register_port_1_w );
+WRITE8_HANDLER( ym2151_register_port_2_w );
 
-WRITE8_HANDLER( YM2151_data_port_0_w );
-WRITE8_HANDLER( YM2151_data_port_1_w );
-WRITE8_HANDLER( YM2151_data_port_2_w );
+WRITE8_HANDLER( ym2151_data_port_0_w );
+WRITE8_HANDLER( ym2151_data_port_1_w );
+WRITE8_HANDLER( ym2151_data_port_2_w );
 
-WRITE8_HANDLER( YM2151_word_0_w );
-WRITE8_HANDLER( YM2151_word_1_w );
+WRITE8_HANDLER( ym2151_word_0_w );
+WRITE8_HANDLER( ym2151_word_1_w );
 
-READ16_HANDLER( YM2151_status_port_0_lsb_r );
-READ16_HANDLER( YM2151_status_port_1_lsb_r );
-READ16_HANDLER( YM2151_status_port_2_lsb_r );
+READ16_HANDLER( ym2151_status_port_0_lsb_r );
+READ16_HANDLER( ym2151_status_port_1_lsb_r );
+READ16_HANDLER( ym2151_status_port_2_lsb_r );
 
-WRITE16_HANDLER( YM2151_register_port_0_lsb_w );
-WRITE16_HANDLER( YM2151_register_port_1_lsb_w );
-WRITE16_HANDLER( YM2151_register_port_2_lsb_w );
+WRITE16_HANDLER( ym2151_register_port_0_lsb_w );
+WRITE16_HANDLER( ym2151_register_port_1_lsb_w );
+WRITE16_HANDLER( ym2151_register_port_2_lsb_w );
+
+WRITE16_HANDLER( ym2151_data_port_0_lsb_w );
+WRITE16_HANDLER( ym2151_data_port_1_lsb_w );
+WRITE16_HANDLER( ym2151_data_port_2_lsb_w );
+
+#endif /* __2151INTF_H__ */
 
-WRITE16_HANDLER( YM2151_data_port_0_lsb_w );
-WRITE16_HANDLER( YM2151_data_port_1_lsb_w );
-WRITE16_HANDLER( YM2151_data_port_2_lsb_w );
 
-#endif
diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c
index 0f175d8ec06..63932b3a940 100644
--- a/src/emu/sound/2203intf.c
+++ b/src/emu/sound/2203intf.c
@@ -59,17 +59,17 @@ static void IRQHandler(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_2203_0 )
 {
 	struct ym2203_info *info = ptr;
-	YM2203TimerOver(info->chip,0);
+	ym2203_timer_over(info->chip,0);
 }
 
 static TIMER_CALLBACK( timer_callback_2203_1 )
 {
 	struct ym2203_info *info = ptr;
-	YM2203TimerOver(info->chip,1);
+	ym2203_timer_over(info->chip,1);
 }
 
 /* update request from fm.c */
-void YM2203UpdateRequest(void *param)
+void ym2203_update_request(void *param)
 {
 	struct ym2203_info *info = param;
 	stream_update(info->stream);
@@ -94,14 +94,14 @@ static void timer_handler(void *param,int c,int count,int clock)
 static void ym2203_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
 {
 	struct ym2203_info *info = param;
-	YM2203UpdateOne(info->chip, buffer[0], length);
+	ym2203_update_one(info->chip, buffer[0], length);
 }
 
 
-static STATE_POSTLOAD( ym2203_postload )
+static STATE_POSTLOAD( ym2203_intf_postload )
 {
 	struct ym2203_info *info = param;
-	YM2203Postload(info->chip);
+	ym2203_postload(info->chip);
 }
 
 
@@ -135,9 +135,9 @@ static void *ym2203_start(const char *tag, int sndindex, int clock, const void *
 	info->stream = stream_create(0,1,rate,info,ym2203_stream_update);
 
 	/* Initialize FM emurator */
-	info->chip = YM2203Init(info,sndindex,clock,rate,timer_handler,IRQHandler,&psgintf);
+	info->chip = ym2203_init(info,sndindex,clock,rate,timer_handler,IRQHandler,&psgintf);
 
-	state_save_register_postload(Machine, ym2203_postload, info);
+	state_save_register_postload(Machine, ym2203_intf_postload, info);
 
 	if (info->chip)
 		return info;
@@ -150,172 +150,172 @@ static void *ym2203_start(const char *tag, int sndindex, int clock, const void *
 static void ym2203_stop(void *token)
 {
 	struct ym2203_info *info = token;
-	YM2203Shutdown(info->chip);
+	ym2203_shutdown(info->chip);
 	ay8910_stop_ym(info->psg);
 }
 
 static void ym2203_reset(void *token)
 {
 	struct ym2203_info *info = token;
-	YM2203ResetChip(info->chip);
+	ym2203_reset_chip(info->chip);
 }
 
 
 
-READ8_HANDLER( YM2203_status_port_0_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return YM2203Read(info->chip,0); }
-READ8_HANDLER( YM2203_status_port_1_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return YM2203Read(info->chip,0); }
-READ8_HANDLER( YM2203_status_port_2_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return YM2203Read(info->chip,0); }
-READ8_HANDLER( YM2203_status_port_3_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return YM2203Read(info->chip,0); }
-READ8_HANDLER( YM2203_status_port_4_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return YM2203Read(info->chip,0); }
+READ8_HANDLER( ym2203_status_port_0_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return ym2203_read(info->chip,0); }
+READ8_HANDLER( ym2203_status_port_1_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return ym2203_read(info->chip,0); }
+READ8_HANDLER( ym2203_status_port_2_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return ym2203_read(info->chip,0); }
+READ8_HANDLER( ym2203_status_port_3_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return ym2203_read(info->chip,0); }
+READ8_HANDLER( ym2203_status_port_4_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return ym2203_read(info->chip,0); }
 
-READ8_HANDLER( YM2203_read_port_0_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return YM2203Read(info->chip,1); }
-READ8_HANDLER( YM2203_read_port_1_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return YM2203Read(info->chip,1); }
-READ8_HANDLER( YM2203_read_port_2_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return YM2203Read(info->chip,1); }
-READ8_HANDLER( YM2203_read_port_3_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return YM2203Read(info->chip,1); }
-READ8_HANDLER( YM2203_read_port_4_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return YM2203Read(info->chip,1); }
+READ8_HANDLER( ym2203_read_port_0_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return ym2203_read(info->chip,1); }
+READ8_HANDLER( ym2203_read_port_1_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return ym2203_read(info->chip,1); }
+READ8_HANDLER( ym2203_read_port_2_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return ym2203_read(info->chip,1); }
+READ8_HANDLER( ym2203_read_port_3_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return ym2203_read(info->chip,1); }
+READ8_HANDLER( ym2203_read_port_4_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return ym2203_read(info->chip,1); }
 
-WRITE8_HANDLER( YM2203_control_port_0_w )
+WRITE8_HANDLER( ym2203_control_port_0_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
-	YM2203Write(info->chip,0,data);
+	ym2203_write(info->chip,0,data);
 }
-WRITE8_HANDLER( YM2203_control_port_1_w )
+WRITE8_HANDLER( ym2203_control_port_1_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
-	YM2203Write(info->chip,0,data);
+	ym2203_write(info->chip,0,data);
 }
-WRITE8_HANDLER( YM2203_control_port_2_w )
+WRITE8_HANDLER( ym2203_control_port_2_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
-	YM2203Write(info->chip,0,data);
+	ym2203_write(info->chip,0,data);
 }
-WRITE8_HANDLER( YM2203_control_port_3_w )
+WRITE8_HANDLER( ym2203_control_port_3_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
-	YM2203Write(info->chip,0,data);
+	ym2203_write(info->chip,0,data);
 }
-WRITE8_HANDLER( YM2203_control_port_4_w )
+WRITE8_HANDLER( ym2203_control_port_4_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
-	YM2203Write(info->chip,0,data);
+	ym2203_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM2203_write_port_0_w )
+WRITE8_HANDLER( ym2203_write_port_0_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
-	YM2203Write(info->chip,1,data);
+	ym2203_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM2203_write_port_1_w )
+WRITE8_HANDLER( ym2203_write_port_1_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
-	YM2203Write(info->chip,1,data);
+	ym2203_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM2203_write_port_2_w )
+WRITE8_HANDLER( ym2203_write_port_2_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
-	YM2203Write(info->chip,1,data);
+	ym2203_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM2203_write_port_3_w )
+WRITE8_HANDLER( ym2203_write_port_3_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
-	YM2203Write(info->chip,1,data);
+	ym2203_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM2203_write_port_4_w )
+WRITE8_HANDLER( ym2203_write_port_4_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
-	YM2203Write(info->chip,1,data);
+	ym2203_write(info->chip,1,data);
 }
 
 
-READ16_HANDLER( YM2203_status_port_0_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return YM2203Read(info->chip,0) | 0xff00; }
-READ16_HANDLER( YM2203_status_port_1_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return YM2203Read(info->chip,0) | 0xff00; }
-READ16_HANDLER( YM2203_status_port_2_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return YM2203Read(info->chip,0) | 0xff00; }
-READ16_HANDLER( YM2203_status_port_3_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return YM2203Read(info->chip,0) | 0xff00; }
-READ16_HANDLER( YM2203_status_port_4_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return YM2203Read(info->chip,0) | 0xff00; }
+READ16_HANDLER( ym2203_status_port_0_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return ym2203_read(info->chip,0) | 0xff00; }
+READ16_HANDLER( ym2203_status_port_1_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return ym2203_read(info->chip,0) | 0xff00; }
+READ16_HANDLER( ym2203_status_port_2_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return ym2203_read(info->chip,0) | 0xff00; }
+READ16_HANDLER( ym2203_status_port_3_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return ym2203_read(info->chip,0) | 0xff00; }
+READ16_HANDLER( ym2203_status_port_4_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return ym2203_read(info->chip,0) | 0xff00; }
 
-READ16_HANDLER( YM2203_read_port_0_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return YM2203Read(info->chip,1) | 0xff00; }
-READ16_HANDLER( YM2203_read_port_1_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return YM2203Read(info->chip,1) | 0xff00; }
-READ16_HANDLER( YM2203_read_port_2_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return YM2203Read(info->chip,1) | 0xff00; }
-READ16_HANDLER( YM2203_read_port_3_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return YM2203Read(info->chip,1) | 0xff00; }
-READ16_HANDLER( YM2203_read_port_4_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return YM2203Read(info->chip,1) | 0xff00; }
+READ16_HANDLER( ym2203_read_port_0_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 0); return ym2203_read(info->chip,1) | 0xff00; }
+READ16_HANDLER( ym2203_read_port_1_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 1); return ym2203_read(info->chip,1) | 0xff00; }
+READ16_HANDLER( ym2203_read_port_2_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 2); return ym2203_read(info->chip,1) | 0xff00; }
+READ16_HANDLER( ym2203_read_port_3_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 3); return ym2203_read(info->chip,1) | 0xff00; }
+READ16_HANDLER( ym2203_read_port_4_lsb_r ) { struct ym2203_info *info = sndti_token(SOUND_YM2203, 4); return ym2203_read(info->chip,1) | 0xff00; }
 
-WRITE16_HANDLER( YM2203_control_port_0_lsb_w )
+WRITE16_HANDLER( ym2203_control_port_0_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,0,data);
+		ym2203_write(info->chip,0,data);
 }
-WRITE16_HANDLER( YM2203_control_port_1_lsb_w )
+WRITE16_HANDLER( ym2203_control_port_1_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,0,data);
+		ym2203_write(info->chip,0,data);
 }
-WRITE16_HANDLER( YM2203_control_port_2_lsb_w )
+WRITE16_HANDLER( ym2203_control_port_2_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,0,data);
+		ym2203_write(info->chip,0,data);
 }
-WRITE16_HANDLER( YM2203_control_port_3_lsb_w )
+WRITE16_HANDLER( ym2203_control_port_3_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,0,data);
+		ym2203_write(info->chip,0,data);
 }
-WRITE16_HANDLER( YM2203_control_port_4_lsb_w )
+WRITE16_HANDLER( ym2203_control_port_4_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,0,data);
+		ym2203_write(info->chip,0,data);
 }
 
-WRITE16_HANDLER( YM2203_write_port_0_lsb_w )
+WRITE16_HANDLER( ym2203_write_port_0_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 0);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,1,data);
+		ym2203_write(info->chip,1,data);
 }
-WRITE16_HANDLER( YM2203_write_port_1_lsb_w )
+WRITE16_HANDLER( ym2203_write_port_1_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 1);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,1,data);
+		ym2203_write(info->chip,1,data);
 }
-WRITE16_HANDLER( YM2203_write_port_2_lsb_w )
+WRITE16_HANDLER( ym2203_write_port_2_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 2);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,1,data);
+		ym2203_write(info->chip,1,data);
 }
-WRITE16_HANDLER( YM2203_write_port_3_lsb_w )
+WRITE16_HANDLER( ym2203_write_port_3_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 3);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,1,data);
+		ym2203_write(info->chip,1,data);
 }
-WRITE16_HANDLER( YM2203_write_port_4_lsb_w )
+WRITE16_HANDLER( ym2203_write_port_4_lsb_w )
 {
 	struct ym2203_info *info = sndti_token(SOUND_YM2203, 4);
 	if (ACCESSING_BITS_0_7)
-		YM2203Write(info->chip,1,data);
+		ym2203_write(info->chip,1,data);
 }
 
 
-WRITE8_HANDLER( YM2203_word_0_w )
+WRITE8_HANDLER( ym2203_word_0_w )
 {
 	if (offset)
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 	else
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 }
 
-WRITE8_HANDLER( YM2203_word_1_w )
+WRITE8_HANDLER( ym2203_word_1_w )
 {
 	if (offset)
-		YM2203_write_port_1_w(machine,0,data);
+		ym2203_write_port_1_w(machine,0,data);
 	else
-		YM2203_control_port_1_w(machine,0,data);
+		ym2203_control_port_1_w(machine,0,data);
 }
 
 
diff --git a/src/emu/sound/2203intf.h b/src/emu/sound/2203intf.h
index 61e54955e41..a323054f509 100644
--- a/src/emu/sound/2203intf.h
+++ b/src/emu/sound/2203intf.h
@@ -1,5 +1,7 @@
-#ifndef YM2203INTF_H
-#define YM2203INTF_H
+#pragma once
+
+#ifndef __2203INTF_H__
+#define __2203INTF_H__
 
 #include "ay8910.h"
 
@@ -11,55 +13,55 @@ struct _ym2203_interface
 };
 
 
-READ8_HANDLER( YM2203_status_port_0_r );
-READ8_HANDLER( YM2203_status_port_1_r );
-READ8_HANDLER( YM2203_status_port_2_r );
-READ8_HANDLER( YM2203_status_port_3_r );
-READ8_HANDLER( YM2203_status_port_4_r );
+READ8_HANDLER( ym2203_status_port_0_r );
+READ8_HANDLER( ym2203_status_port_1_r );
+READ8_HANDLER( ym2203_status_port_2_r );
+READ8_HANDLER( ym2203_status_port_3_r );
+READ8_HANDLER( ym2203_status_port_4_r );
 
-READ8_HANDLER( YM2203_read_port_0_r );
-READ8_HANDLER( YM2203_read_port_1_r );
-READ8_HANDLER( YM2203_read_port_2_r );
-READ8_HANDLER( YM2203_read_port_3_r );
-READ8_HANDLER( YM2203_read_port_4_r );
+READ8_HANDLER( ym2203_read_port_0_r );
+READ8_HANDLER( ym2203_read_port_1_r );
+READ8_HANDLER( ym2203_read_port_2_r );
+READ8_HANDLER( ym2203_read_port_3_r );
+READ8_HANDLER( ym2203_read_port_4_r );
 
-WRITE8_HANDLER( YM2203_control_port_0_w );
-WRITE8_HANDLER( YM2203_control_port_1_w );
-WRITE8_HANDLER( YM2203_control_port_2_w );
-WRITE8_HANDLER( YM2203_control_port_3_w );
-WRITE8_HANDLER( YM2203_control_port_4_w );
+WRITE8_HANDLER( ym2203_control_port_0_w );
+WRITE8_HANDLER( ym2203_control_port_1_w );
+WRITE8_HANDLER( ym2203_control_port_2_w );
+WRITE8_HANDLER( ym2203_control_port_3_w );
+WRITE8_HANDLER( ym2203_control_port_4_w );
 
-WRITE8_HANDLER( YM2203_write_port_0_w );
-WRITE8_HANDLER( YM2203_write_port_1_w );
-WRITE8_HANDLER( YM2203_write_port_2_w );
-WRITE8_HANDLER( YM2203_write_port_3_w );
-WRITE8_HANDLER( YM2203_write_port_4_w );
+WRITE8_HANDLER( ym2203_write_port_0_w );
+WRITE8_HANDLER( ym2203_write_port_1_w );
+WRITE8_HANDLER( ym2203_write_port_2_w );
+WRITE8_HANDLER( ym2203_write_port_3_w );
+WRITE8_HANDLER( ym2203_write_port_4_w );
 
-READ16_HANDLER( YM2203_status_port_0_lsb_r );
-READ16_HANDLER( YM2203_status_port_1_lsb_r );
-READ16_HANDLER( YM2203_status_port_2_lsb_r );
-READ16_HANDLER( YM2203_status_port_3_lsb_r );
-READ16_HANDLER( YM2203_status_port_4_lsb_r );
+READ16_HANDLER( ym2203_status_port_0_lsb_r );
+READ16_HANDLER( ym2203_status_port_1_lsb_r );
+READ16_HANDLER( ym2203_status_port_2_lsb_r );
+READ16_HANDLER( ym2203_status_port_3_lsb_r );
+READ16_HANDLER( ym2203_status_port_4_lsb_r );
 
-READ16_HANDLER( YM2203_read_port_0_lsb_r );
-READ16_HANDLER( YM2203_read_port_1_lsb_r );
-READ16_HANDLER( YM2203_read_port_2_lsb_r );
-READ16_HANDLER( YM2203_read_port_3_lsb_r );
-READ16_HANDLER( YM2203_read_port_4_lsb_r );
+READ16_HANDLER( ym2203_read_port_0_lsb_r );
+READ16_HANDLER( ym2203_read_port_1_lsb_r );
+READ16_HANDLER( ym2203_read_port_2_lsb_r );
+READ16_HANDLER( ym2203_read_port_3_lsb_r );
+READ16_HANDLER( ym2203_read_port_4_lsb_r );
 
-WRITE16_HANDLER( YM2203_control_port_0_lsb_w );
-WRITE16_HANDLER( YM2203_control_port_1_lsb_w );
-WRITE16_HANDLER( YM2203_control_port_2_lsb_w );
-WRITE16_HANDLER( YM2203_control_port_3_lsb_w );
-WRITE16_HANDLER( YM2203_control_port_4_lsb_w );
+WRITE16_HANDLER( ym2203_control_port_0_lsb_w );
+WRITE16_HANDLER( ym2203_control_port_1_lsb_w );
+WRITE16_HANDLER( ym2203_control_port_2_lsb_w );
+WRITE16_HANDLER( ym2203_control_port_3_lsb_w );
+WRITE16_HANDLER( ym2203_control_port_4_lsb_w );
 
-WRITE16_HANDLER( YM2203_write_port_0_lsb_w );
-WRITE16_HANDLER( YM2203_write_port_1_lsb_w );
-WRITE16_HANDLER( YM2203_write_port_2_lsb_w );
-WRITE16_HANDLER( YM2203_write_port_3_lsb_w );
-WRITE16_HANDLER( YM2203_write_port_4_lsb_w );
+WRITE16_HANDLER( ym2203_write_port_0_lsb_w );
+WRITE16_HANDLER( ym2203_write_port_1_lsb_w );
+WRITE16_HANDLER( ym2203_write_port_2_lsb_w );
+WRITE16_HANDLER( ym2203_write_port_3_lsb_w );
+WRITE16_HANDLER( ym2203_write_port_4_lsb_w );
 
-WRITE8_HANDLER( YM2203_word_0_w );
-WRITE8_HANDLER( YM2203_word_1_w );
+WRITE8_HANDLER( ym2203_word_0_w );
+WRITE8_HANDLER( ym2203_word_1_w );
 
-#endif
+#endif /* __2203INTF_H__ */
diff --git a/src/emu/sound/2413intf.c b/src/emu/sound/2413intf.c
index ada4340737f..089253b3f5b 100644
--- a/src/emu/sound/2413intf.c
+++ b/src/emu/sound/2413intf.c
@@ -39,7 +39,7 @@ void YM2413DAC_update(int chip,stream_sample_t **inputs, stream_sample_t **_buff
 static void ym2413_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ym2413_info *info = param;
-	YM2413UpdateOne(info->chip, buffers, length);
+	ym2413_update_one(info->chip, buffers, length);
 }
 
 static void _stream_update(void *param, int interval)
@@ -57,14 +57,14 @@ static void *ym2413_start(const char *tag, int sndindex, int clock, const void *
 	memset(info, 0, sizeof(*info));
 
 	/* emulator create */
-	info->chip = YM2413Init(clock, rate, sndindex);
+	info->chip = ym2413_init(clock, rate, sndindex);
 	if (!info->chip)
 		return NULL;
 
 	/* stream system initialize */
 	info->stream = stream_create(0,2,rate,info,ym2413_stream_update);
 
-	YM2413SetUpdateHandler(info->chip, _stream_update, info);
+	ym2413_set_update_handler(info->chip, _stream_update, info);
 
 	return info;
 
@@ -98,18 +98,18 @@ static void *ym2413_start(const char *tag, int sndindex, int clock, const void *
 static void ym2413_stop (void *chip)
 {
 	struct ym2413_info *info = chip;
-	YM2413Shutdown(info->chip);
+	ym2413_shutdown(info->chip);
 }
 
 static void ym2413_reset (void *chip)
 {
 	struct ym2413_info *info = chip;
-	YM2413ResetChip(info->chip);
+	ym2413_reset_chip(info->chip);
 }
 
 
 #ifdef YM2413ISA
-WRITE8_HANDLER( YM2413_register_port_0_w ) {
+WRITE8_HANDLER( ym2413_register_port_0_w ) {
 int i,a;
 	outportb(0x308,data); // ym2413_write (0, 0, data);
 	//add delay
@@ -118,37 +118,37 @@ int i,a;
 
  } /* 1st chip */
 #else
-WRITE8_HANDLER( YM2413_register_port_0_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 0); YM2413Write (info->chip, 0, data); } /* 1st chip */
+WRITE8_HANDLER( ym2413_register_port_0_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 0); ym2413_write (info->chip, 0, data); } /* 1st chip */
 #endif
-WRITE8_HANDLER( YM2413_register_port_1_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 1); YM2413Write (info->chip, 0, data); } /* 2nd chip */
-WRITE8_HANDLER( YM2413_register_port_2_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 2); YM2413Write (info->chip, 0, data); } /* 3rd chip */
-WRITE8_HANDLER( YM2413_register_port_3_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 3); YM2413Write (info->chip, 0, data); } /* 4th chip */
+WRITE8_HANDLER( ym2413_register_port_1_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 1); ym2413_write (info->chip, 0, data); } /* 2nd chip */
+WRITE8_HANDLER( ym2413_register_port_2_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 2); ym2413_write (info->chip, 0, data); } /* 3rd chip */
+WRITE8_HANDLER( ym2413_register_port_3_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 3); ym2413_write (info->chip, 0, data); } /* 4th chip */
 
 #ifdef YM2413ISA
-WRITE8_HANDLER( YM2413_data_port_0_w ) {
+WRITE8_HANDLER( ym2413_data_port_0_w ) {
 int i,a;
-	outportb(0x309,data);// YM2413Write (sndti_token(SOUND_YM2413, 0), 1, data);
+	outportb(0x309,data);// ym2413_write (sndti_token(SOUND_YM2413, 0), 1, data);
 	//add delay
 	for (i=0; i<0x40; i++)
 		a = inportb(0x80);
  } /* 1st chip */
 #else
-WRITE8_HANDLER( YM2413_data_port_0_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 0); YM2413Write (info->chip, 1, data); } /* 1st chip */
+WRITE8_HANDLER( ym2413_data_port_0_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 0); ym2413_write (info->chip, 1, data); } /* 1st chip */
 #endif
-WRITE8_HANDLER( YM2413_data_port_1_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 1); YM2413Write (info->chip, 1, data); } /* 2nd chip */
-WRITE8_HANDLER( YM2413_data_port_2_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 2); YM2413Write (info->chip, 1, data); } /* 3rd chip */
-WRITE8_HANDLER( YM2413_data_port_3_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 3); YM2413Write (info->chip, 1, data); } /* 4th chip */
+WRITE8_HANDLER( ym2413_data_port_1_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 1); ym2413_write (info->chip, 1, data); } /* 2nd chip */
+WRITE8_HANDLER( ym2413_data_port_2_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 2); ym2413_write (info->chip, 1, data); } /* 3rd chip */
+WRITE8_HANDLER( ym2413_data_port_3_w ) { struct ym2413_info *info = sndti_token(SOUND_YM2413, 3); ym2413_write (info->chip, 1, data); } /* 4th chip */
 
-WRITE16_HANDLER( YM2413_register_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_0_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_0_msb_w ) { if (ACCESSING_BITS_8_15) YM2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
-WRITE16_HANDLER( YM2413_register_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_1_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_2_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_register_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_register_port_3_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_0_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_0_msb_w ) { if (ACCESSING_BITS_8_15) YM2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
-WRITE16_HANDLER( YM2413_data_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_1_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_2_w(machine,offset,data & 0xff); }
-WRITE16_HANDLER( YM2413_data_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) YM2413_data_port_3_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_register_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_register_port_0_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_register_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ym2413_register_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
+WRITE16_HANDLER( ym2413_register_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_register_port_1_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_register_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_register_port_2_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_register_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_register_port_3_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_data_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_data_port_0_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_data_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ym2413_data_port_0_w(machine,offset,((data & 0xff00) >> 8)); }
+WRITE16_HANDLER( ym2413_data_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_data_port_1_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_data_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_data_port_2_w(machine,offset,data & 0xff); }
+WRITE16_HANDLER( ym2413_data_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ym2413_data_port_3_w(machine,offset,data & 0xff); }
 
 
 /**************************************************************************
diff --git a/src/emu/sound/2413intf.h b/src/emu/sound/2413intf.h
index a1517bedd3b..48cced03114 100644
--- a/src/emu/sound/2413intf.h
+++ b/src/emu/sound/2413intf.h
@@ -1,26 +1,27 @@
-#ifndef YM2413INTF_H
-#define YM2413INTF_H
+#pragma once
+
+#ifndef __2413INTF_H__
+#define __2413INTF_H__
 
 
-WRITE8_HANDLER( YM2413_register_port_0_w );
-WRITE8_HANDLER( YM2413_register_port_1_w );
-WRITE8_HANDLER( YM2413_register_port_2_w );
-WRITE8_HANDLER( YM2413_register_port_3_w );
-WRITE8_HANDLER( YM2413_data_port_0_w );
-WRITE8_HANDLER( YM2413_data_port_1_w );
-WRITE8_HANDLER( YM2413_data_port_2_w );
-WRITE8_HANDLER( YM2413_data_port_3_w );
+WRITE8_HANDLER( ym2413_register_port_0_w );
+WRITE8_HANDLER( ym2413_register_port_1_w );
+WRITE8_HANDLER( ym2413_register_port_2_w );
+WRITE8_HANDLER( ym2413_register_port_3_w );
+WRITE8_HANDLER( ym2413_data_port_0_w );
+WRITE8_HANDLER( ym2413_data_port_1_w );
+WRITE8_HANDLER( ym2413_data_port_2_w );
+WRITE8_HANDLER( ym2413_data_port_3_w );
 
-WRITE16_HANDLER( YM2413_register_port_0_lsb_w );
-WRITE16_HANDLER( YM2413_register_port_0_msb_w );
-WRITE16_HANDLER( YM2413_register_port_1_lsb_w );
-WRITE16_HANDLER( YM2413_register_port_2_lsb_w );
-WRITE16_HANDLER( YM2413_register_port_3_lsb_w );
-WRITE16_HANDLER( YM2413_data_port_0_lsb_w );
-WRITE16_HANDLER( YM2413_data_port_0_msb_w );
-WRITE16_HANDLER( YM2413_data_port_1_lsb_w );
-WRITE16_HANDLER( YM2413_data_port_2_lsb_w );
-WRITE16_HANDLER( YM2413_data_port_3_lsb_w );
-
-#endif
+WRITE16_HANDLER( ym2413_register_port_0_lsb_w );
+WRITE16_HANDLER( ym2413_register_port_0_msb_w );
+WRITE16_HANDLER( ym2413_register_port_1_lsb_w );
+WRITE16_HANDLER( ym2413_register_port_2_lsb_w );
+WRITE16_HANDLER( ym2413_register_port_3_lsb_w );
+WRITE16_HANDLER( ym2413_data_port_0_lsb_w );
+WRITE16_HANDLER( ym2413_data_port_0_msb_w );
+WRITE16_HANDLER( ym2413_data_port_1_lsb_w );
+WRITE16_HANDLER( ym2413_data_port_2_lsb_w );
+WRITE16_HANDLER( ym2413_data_port_3_lsb_w );
 
+#endif /* __2413INTF_H__ */
diff --git a/src/emu/sound/2608intf.c b/src/emu/sound/2608intf.c
index 89ee68eb7c7..215d06bc120 100644
--- a/src/emu/sound/2608intf.c
+++ b/src/emu/sound/2608intf.c
@@ -73,13 +73,13 @@ static void IRQHandler(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_2608_0 )
 {
 	struct ym2608_info *info = ptr;
-	YM2608TimerOver(info->chip,0);
+	ym2608_timer_over(info->chip,0);
 }
 
 static TIMER_CALLBACK( timer_callback_2608_1 )
 {
 	struct ym2608_info *info = ptr;
-	YM2608TimerOver(info->chip,1);
+	ym2608_timer_over(info->chip,1);
 }
 
 static void timer_handler(void *param,int c,int count,int clock)
@@ -98,7 +98,7 @@ static void timer_handler(void *param,int c,int count,int clock)
 }
 
 /* update request from fm.c */
-void YM2608UpdateRequest(void *param)
+void ym2608_update_request(void *param)
 {
 	struct ym2608_info *info = param;
 	stream_update(info->stream);
@@ -107,14 +107,14 @@ void YM2608UpdateRequest(void *param)
 static void ym2608_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ym2608_info *info = param;
-	YM2608UpdateOne(info->chip, buffers, length);
+	ym2608_update_one(info->chip, buffers, length);
 }
 
 
-static STATE_POSTLOAD( ym2608_postload )
+static STATE_POSTLOAD( ym2608_intf_postload )
 {
 	struct ym2608_info *info = param;
-	YM2608Postload(info->chip);
+	ym2608_postload(info->chip);
 }
 
 
@@ -155,11 +155,11 @@ static void *ym2608_start(const char *tag, int sndindex, int clock, const void *
 	pcmsizea = memory_region_length(Machine, tag);
 
 	/* initialize YM2608 */
-	info->chip = YM2608Init(info,sndindex,clock,rate,
+	info->chip = ym2608_init(info,sndindex,clock,rate,
 		           pcmbufa,pcmsizea,
 		           timer_handler,IRQHandler,&psgintf);
 
-	state_save_register_postload(Machine, ym2608_postload, info);
+	state_save_register_postload(Machine, ym2608_intf_postload, info);
 
 	if (info->chip)
 		return info;
@@ -171,119 +171,119 @@ static void *ym2608_start(const char *tag, int sndindex, int clock, const void *
 static void ym2608_stop(void *token)
 {
 	struct ym2608_info *info = token;
-	YM2608Shutdown(info->chip);
+	ym2608_shutdown(info->chip);
 	ay8910_stop_ym(info->psg);
 }
 
 static void ym2608_reset(void *token)
 {
 	struct ym2608_info *info = token;
-	YM2608ResetChip(info->chip);
+	ym2608_reset_chip(info->chip);
 }
 
 /************************************************/
 /* Status Read for YM2608 - Chip 0              */
 /************************************************/
-READ8_HANDLER( YM2608_status_port_0_A_r )
+READ8_HANDLER( ym2608_status_port_0_a_r )
 {
-//logerror("PC %04x: 2608 S0A=%02X\n",activecpu_get_pc(),YM2608Read(sndti_token(SOUND_YM2608, 0),0));
+//logerror("PC %04x: 2608 S0A=%02X\n",activecpu_get_pc(),ym2608_read(sndti_token(SOUND_YM2608, 0),0));
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	return YM2608Read(info->chip,0);
+	return ym2608_read(info->chip,0);
 }
 
-READ8_HANDLER( YM2608_status_port_0_B_r )
+READ8_HANDLER( ym2608_status_port_0_b_r )
 {
-//logerror("PC %04x: 2608 S0B=%02X\n",activecpu_get_pc(),YM2608Read(sndti_token(SOUND_YM2608, 0),2));
+//logerror("PC %04x: 2608 S0B=%02X\n",activecpu_get_pc(),ym2608_read(sndti_token(SOUND_YM2608, 0),2));
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	return YM2608Read(info->chip,2);
+	return ym2608_read(info->chip,2);
 }
 
 /************************************************/
 /* Status Read for YM2608 - Chip 1              */
 /************************************************/
-READ8_HANDLER( YM2608_status_port_1_A_r ) {
+READ8_HANDLER( ym2608_status_port_1_a_r ) {
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	return YM2608Read(info->chip,0);
+	return ym2608_read(info->chip,0);
 }
 
-READ8_HANDLER( YM2608_status_port_1_B_r ) {
+READ8_HANDLER( ym2608_status_port_1_b_r ) {
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	return YM2608Read(info->chip,2);
+	return ym2608_read(info->chip,2);
 }
 
 /************************************************/
 /* Port Read for YM2608 - Chip 0                */
 /************************************************/
-READ8_HANDLER( YM2608_read_port_0_r ){
+READ8_HANDLER( ym2608_read_port_0_r ){
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	return YM2608Read(info->chip,1);
+	return ym2608_read(info->chip,1);
 }
 
 /************************************************/
 /* Port Read for YM2608 - Chip 1                */
 /************************************************/
-READ8_HANDLER( YM2608_read_port_1_r ){
+READ8_HANDLER( ym2608_read_port_1_r ){
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	return YM2608Read(info->chip,1);
+	return ym2608_read(info->chip,1);
 }
 
 /************************************************/
 /* Control Write for YM2608 - Chip 0            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2608_control_port_0_A_w )
+WRITE8_HANDLER( ym2608_control_port_0_a_w )
 {
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	YM2608Write(info->chip,0,data);
+	ym2608_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM2608_control_port_0_B_w )
+WRITE8_HANDLER( ym2608_control_port_0_b_w )
 {
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	YM2608Write(info->chip,2,data);
+	ym2608_write(info->chip,2,data);
 }
 
 /************************************************/
 /* Control Write for YM2608 - Chip 1            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2608_control_port_1_A_w ){
+WRITE8_HANDLER( ym2608_control_port_1_a_w ){
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	YM2608Write(info->chip,0,data);
+	ym2608_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM2608_control_port_1_B_w ){
+WRITE8_HANDLER( ym2608_control_port_1_b_w ){
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	YM2608Write(info->chip,2,data);
+	ym2608_write(info->chip,2,data);
 }
 
 /************************************************/
 /* Data Write for YM2608 - Chip 0               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2608_data_port_0_A_w )
+WRITE8_HANDLER( ym2608_data_port_0_a_w )
 {
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	YM2608Write(info->chip,1,data);
+	ym2608_write(info->chip,1,data);
 }
 
-WRITE8_HANDLER( YM2608_data_port_0_B_w )
+WRITE8_HANDLER( ym2608_data_port_0_b_w )
 {
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 0);
-	YM2608Write(info->chip,3,data);
+	ym2608_write(info->chip,3,data);
 }
 
 /************************************************/
 /* Data Write for YM2608 - Chip 1               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2608_data_port_1_A_w ){
+WRITE8_HANDLER( ym2608_data_port_1_a_w ){
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	YM2608Write(info->chip,1,data);
+	ym2608_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM2608_data_port_1_B_w ){
+WRITE8_HANDLER( ym2608_data_port_1_b_w ){
 	struct ym2608_info *info = sndti_token(SOUND_YM2608, 1);
-	YM2608Write(info->chip,3,data);
+	ym2608_write(info->chip,3,data);
 }
 
 /**************** end of file ****************/
diff --git a/src/emu/sound/2608intf.h b/src/emu/sound/2608intf.h
index a88d73e4a4a..8fcc2c15ba7 100644
--- a/src/emu/sound/2608intf.h
+++ b/src/emu/sound/2608intf.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef __2608INTF_H__
 #define __2608INTF_H__
 
@@ -14,23 +16,23 @@ struct _ym2608_interface
 /************************************************/
 /* Chip 0 functions             */
 /************************************************/
-READ8_HANDLER( YM2608_status_port_0_A_r );
-READ8_HANDLER( YM2608_status_port_0_B_r );
-READ8_HANDLER( YM2608_read_port_0_r );
-WRITE8_HANDLER( YM2608_control_port_0_A_w );
-WRITE8_HANDLER( YM2608_control_port_0_B_w );
-WRITE8_HANDLER( YM2608_data_port_0_A_w );
-WRITE8_HANDLER( YM2608_data_port_0_B_w );
+READ8_HANDLER( ym2608_status_port_0_a_r );
+READ8_HANDLER( ym2608_status_port_0_b_r );
+READ8_HANDLER( ym2608_read_port_0_r );
+WRITE8_HANDLER( ym2608_control_port_0_a_w );
+WRITE8_HANDLER( ym2608_control_port_0_b_w );
+WRITE8_HANDLER( ym2608_data_port_0_a_w );
+WRITE8_HANDLER( ym2608_data_port_0_b_w );
 
 /************************************************/
 /* Chip 1 functions             */
 /************************************************/
-READ8_HANDLER( YM2608_status_port_1_A_r );
-READ8_HANDLER( YM2608_status_port_1_B_r );
-READ8_HANDLER( YM2608_read_port_1_r );
-WRITE8_HANDLER( YM2608_control_port_1_A_w );
-WRITE8_HANDLER( YM2608_control_port_1_B_w );
-WRITE8_HANDLER( YM2608_data_port_1_A_w );
-WRITE8_HANDLER( YM2608_data_port_1_B_w );
+READ8_HANDLER( ym2608_status_port_1_a_r );
+READ8_HANDLER( ym2608_status_port_1_b_r );
+READ8_HANDLER( ym2608_read_port_1_r );
+WRITE8_HANDLER( ym2608_control_port_1_a_w );
+WRITE8_HANDLER( ym2608_control_port_1_b_w );
+WRITE8_HANDLER( ym2608_data_port_1_a_w );
+WRITE8_HANDLER( ym2608_data_port_1_b_w );
 
 #endif /* __2608INTF_H__ */
diff --git a/src/emu/sound/2610intf.c b/src/emu/sound/2610intf.c
index 9c2596b675e..0ea3924fd4c 100644
--- a/src/emu/sound/2610intf.c
+++ b/src/emu/sound/2610intf.c
@@ -73,13 +73,13 @@ static void IRQHandler(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_0 )
 {
 	struct ym2610_info *info = ptr;
-	YM2610TimerOver(info->chip,0);
+	ym2610_timer_over(info->chip,0);
 }
 
 static TIMER_CALLBACK( timer_callback_1 )
 {
 	struct ym2610_info *info = ptr;
-	YM2610TimerOver(info->chip,1);
+	ym2610_timer_over(info->chip,1);
 }
 
 static void timer_handler(void *param,int c,int count,int clock)
@@ -99,7 +99,7 @@ static void timer_handler(void *param,int c,int count,int clock)
 }
 
 /* update request from fm.c */
-void YM2610UpdateRequest(void *param)
+void ym2610_update_request(void *param)
 {
 	struct ym2610_info *info = param;
 	stream_update(info->stream);
@@ -109,14 +109,14 @@ void YM2610UpdateRequest(void *param)
 static void ym2610_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ym2610_info *info = param;
-	YM2610UpdateOne(info->chip, buffers, length);
+	ym2610_update_one(info->chip, buffers, length);
 }
 
 
-static STATE_POSTLOAD( ym2610_postload )
+static STATE_POSTLOAD( ym2610_intf_postload )
 {
 	struct ym2610_info *info = param;
-	YM2610Postload(info->chip);
+	ym2610_postload(info->chip);
 }
 
 
@@ -165,11 +165,11 @@ static void *ym2610_start(const char *tag, int sndindex, int clock, const void *
 	}
 
 	/**** initialize YM2610 ****/
-	info->chip = YM2610Init(info,sndindex,clock,rate,
+	info->chip = ym2610_init(info,sndindex,clock,rate,
 		           pcmbufa,pcmsizea,pcmbufb,pcmsizeb,
 		           timer_handler,IRQHandler,&psgintf);
 
-	state_save_register_postload(Machine, ym2610_postload, info);
+	state_save_register_postload(Machine, ym2610_intf_postload, info);
 
 	if (info->chip)
 		return info;
@@ -183,7 +183,7 @@ static void *ym2610_start(const char *tag, int sndindex, int clock, const void *
 static void ym2610b_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ym2610_info *info = param;
-	YM2610BUpdateOne(info->chip, buffers, length);
+	ym2610b_update_one(info->chip, buffers, length);
 }
 
 static void *ym2610b_start(const char *tag, int sndindex, int clock, const void *config)
@@ -231,7 +231,7 @@ static void *ym2610b_start(const char *tag, int sndindex, int clock, const void
 	}
 
 	/**** initialize YM2610 ****/
-	info->chip = YM2610Init(info,sndindex,clock,rate,
+	info->chip = ym2610_init(info,sndindex,clock,rate,
 		           pcmbufa,pcmsizea,pcmbufb,pcmsizeb,
 		           timer_handler,IRQHandler,&psgintf);
 	if (info->chip)
@@ -245,131 +245,131 @@ static void *ym2610b_start(const char *tag, int sndindex, int clock, const void
 static void ym2610_stop(void *token)
 {
 	struct ym2610_info *info = token;
-	YM2610Shutdown(info->chip);
+	ym2610_shutdown(info->chip);
 	ay8910_stop_ym(info->psg);
 }
 
 static void ym2610_reset(void *token)
 {
 	struct ym2610_info *info = token;
-	YM2610ResetChip(info->chip);
+	ym2610_reset_chip(info->chip);
 }
 
 /************************************************/
 /* Status Read for YM2610 - Chip 0              */
 /************************************************/
-READ8_HANDLER( YM2610_status_port_0_A_r )
+READ8_HANDLER( ym2610_status_port_0_a_r )
 {
-//logerror("PC %04x: 2610 S0A=%02X\n",activecpu_get_pc(),YM2610Read(sndti_token(chip_type,0,0));
+//logerror("PC %04x: 2610 S0A=%02X\n",activecpu_get_pc(),ym2610_read(sndti_token(chip_type,0,0));
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	return YM2610Read(info->chip,0);
+	return ym2610_read(info->chip,0);
 }
 
-READ16_HANDLER( YM2610_status_port_0_A_lsb_r )
+READ16_HANDLER( ym2610_status_port_0_a_lsb_r )
 {
-//logerror("PC %04x: 2610 S0A=%02X\n",activecpu_get_pc(),YM2610Read(sndti_token(chip_type,0,0));
+//logerror("PC %04x: 2610 S0A=%02X\n",activecpu_get_pc(),ym2610_read(sndti_token(chip_type,0,0));
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	return YM2610Read(info->chip,0);
+	return ym2610_read(info->chip,0);
 }
 
-READ8_HANDLER( YM2610_status_port_0_B_r )
+READ8_HANDLER( ym2610_status_port_0_b_r )
 {
-//logerror("PC %04x: 2610 S0B=%02X\n",activecpu_get_pc(),YM2610Read(sndti_token(chip_type,0,2));
+//logerror("PC %04x: 2610 S0B=%02X\n",activecpu_get_pc(),ym2610_read(sndti_token(chip_type,0,2));
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	return YM2610Read(info->chip,2);
+	return ym2610_read(info->chip,2);
 }
 
-READ16_HANDLER( YM2610_status_port_0_B_lsb_r )
+READ16_HANDLER( ym2610_status_port_0_b_lsb_r )
 {
-//logerror("PC %04x: 2610 S0B=%02X\n",activecpu_get_pc(),YM2610Read(sndti_token(chip_type,0,2));
+//logerror("PC %04x: 2610 S0B=%02X\n",activecpu_get_pc(),ym2610_read(sndti_token(chip_type,0,2));
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	return YM2610Read(info->chip,2);
+	return ym2610_read(info->chip,2);
 }
 
 /************************************************/
 /* Status Read for YM2610 - Chip 1              */
 /************************************************/
-READ8_HANDLER( YM2610_status_port_1_A_r ) {
+READ8_HANDLER( ym2610_status_port_1_a_r ) {
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	return YM2610Read(info->chip,0);
+	return ym2610_read(info->chip,0);
 }
 
-READ16_HANDLER( YM2610_status_port_1_A_lsb_r ) {
+READ16_HANDLER( ym2610_status_port_1_a_lsb_r ) {
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	return YM2610Read(info->chip,0);
+	return ym2610_read(info->chip,0);
 }
 
-READ8_HANDLER( YM2610_status_port_1_B_r ) {
+READ8_HANDLER( ym2610_status_port_1_b_r ) {
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	return YM2610Read(info->chip,2);
+	return ym2610_read(info->chip,2);
 }
 
-READ16_HANDLER( YM2610_status_port_1_B_lsb_r ) {
+READ16_HANDLER( ym2610_status_port_1_b_lsb_r ) {
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	return YM2610Read(info->chip,2);
+	return ym2610_read(info->chip,2);
 }
 
 /************************************************/
 /* Port Read for YM2610 - Chip 0                */
 /************************************************/
-READ8_HANDLER( YM2610_read_port_0_r ){
+READ8_HANDLER( ym2610_read_port_0_r ){
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	return YM2610Read(info->chip,1);
+	return ym2610_read(info->chip,1);
 }
 
-READ16_HANDLER( YM2610_read_port_0_lsb_r ){
+READ16_HANDLER( ym2610_read_port_0_lsb_r ){
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	return YM2610Read(info->chip,1);
+	return ym2610_read(info->chip,1);
 }
 
 /************************************************/
 /* Port Read for YM2610 - Chip 1                */
 /************************************************/
-READ8_HANDLER( YM2610_read_port_1_r ){
+READ8_HANDLER( ym2610_read_port_1_r ){
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	return YM2610Read(info->chip,1);
+	return ym2610_read(info->chip,1);
 }
 
-READ16_HANDLER( YM2610_read_port_1_lsb_r ){
+READ16_HANDLER( ym2610_read_port_1_lsb_r ){
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	return YM2610Read(info->chip,1);
+	return ym2610_read(info->chip,1);
 }
 
 /************************************************/
 /* Control Write for YM2610 - Chip 0            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2610_control_port_0_A_w )
+WRITE8_HANDLER( ym2610_control_port_0_a_w )
 {
 //logerror("PC %04x: 2610 Reg A %02X",activecpu_get_pc(),data);
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	YM2610Write(info->chip,0,data);
+	ym2610_write(info->chip,0,data);
 }
 
-WRITE16_HANDLER( YM2610_control_port_0_A_lsb_w )
+WRITE16_HANDLER( ym2610_control_port_0_a_lsb_w )
 {
 //logerror("PC %04x: 2610 Reg A %02X",activecpu_get_pc(),data);
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,0);
-		YM2610Write(info->chip,0,data);
+		ym2610_write(info->chip,0,data);
 	}
 }
 
-WRITE8_HANDLER( YM2610_control_port_0_B_w )
+WRITE8_HANDLER( ym2610_control_port_0_b_w )
 {
 //logerror("PC %04x: 2610 Reg B %02X",activecpu_get_pc(),data);
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	YM2610Write(info->chip,2,data);
+	ym2610_write(info->chip,2,data);
 }
 
-WRITE16_HANDLER( YM2610_control_port_0_B_lsb_w )
+WRITE16_HANDLER( ym2610_control_port_0_b_lsb_w )
 {
 //logerror("PC %04x: 2610 Reg B %02X",activecpu_get_pc(),data);
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,0);
-		YM2610Write(info->chip,2,data);
+		ym2610_write(info->chip,2,data);
 	}
 }
 
@@ -377,29 +377,29 @@ WRITE16_HANDLER( YM2610_control_port_0_B_lsb_w )
 /* Control Write for YM2610 - Chip 1            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2610_control_port_1_A_w ){
+WRITE8_HANDLER( ym2610_control_port_1_a_w ){
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	YM2610Write(info->chip,0,data);
+	ym2610_write(info->chip,0,data);
 }
 
-WRITE16_HANDLER( YM2610_control_port_1_A_lsb_w ){
+WRITE16_HANDLER( ym2610_control_port_1_a_lsb_w ){
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,1);
-		YM2610Write(info->chip,0,data);
+		ym2610_write(info->chip,0,data);
 	}
 }
 
-WRITE8_HANDLER( YM2610_control_port_1_B_w ){
+WRITE8_HANDLER( ym2610_control_port_1_b_w ){
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	YM2610Write(info->chip,2,data);
+	ym2610_write(info->chip,2,data);
 }
 
-WRITE16_HANDLER( YM2610_control_port_1_B_lsb_w ){
+WRITE16_HANDLER( ym2610_control_port_1_b_lsb_w ){
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,1);
-		YM2610Write(info->chip,2,data);
+		ym2610_write(info->chip,2,data);
 	}
 }
 
@@ -407,37 +407,37 @@ WRITE16_HANDLER( YM2610_control_port_1_B_lsb_w ){
 /* Data Write for YM2610 - Chip 0               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2610_data_port_0_A_w )
+WRITE8_HANDLER( ym2610_data_port_0_a_w )
 {
 //logerror(" =%02X\n",data);
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	YM2610Write(info->chip,1,data);
+	ym2610_write(info->chip,1,data);
 }
 
-WRITE16_HANDLER( YM2610_data_port_0_A_lsb_w )
+WRITE16_HANDLER( ym2610_data_port_0_a_lsb_w )
 {
 //logerror(" =%02X\n",data);
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,0);
-		YM2610Write(info->chip,1,data);
+		ym2610_write(info->chip,1,data);
 	}
 }
 
-WRITE8_HANDLER( YM2610_data_port_0_B_w )
+WRITE8_HANDLER( ym2610_data_port_0_b_w )
 {
 //logerror(" =%02X\n",data);
 	struct ym2610_info *info = sndti_token(chip_type,0);
-	YM2610Write(info->chip,3,data);
+	ym2610_write(info->chip,3,data);
 }
 
-WRITE16_HANDLER( YM2610_data_port_0_B_lsb_w )
+WRITE16_HANDLER( ym2610_data_port_0_b_lsb_w )
 {
 //logerror(" =%02X\n",data);
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,0);
-		YM2610Write(info->chip,3,data);
+		ym2610_write(info->chip,3,data);
 	}
 }
 
@@ -445,29 +445,29 @@ WRITE16_HANDLER( YM2610_data_port_0_B_lsb_w )
 /* Data Write for YM2610 - Chip 1               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2610_data_port_1_A_w ){
+WRITE8_HANDLER( ym2610_data_port_1_a_w ){
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	YM2610Write(info->chip,1,data);
+	ym2610_write(info->chip,1,data);
 }
 
-WRITE16_HANDLER( YM2610_data_port_1_A_lsb_w ){
+WRITE16_HANDLER( ym2610_data_port_1_a_lsb_w ){
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,1);
-		YM2610Write(info->chip,1,data);
+		ym2610_write(info->chip,1,data);
 	}
 }
 
-WRITE8_HANDLER( YM2610_data_port_1_B_w ){
+WRITE8_HANDLER( ym2610_data_port_1_b_w ){
 	struct ym2610_info *info = sndti_token(chip_type,1);
-	YM2610Write(info->chip,3,data);
+	ym2610_write(info->chip,3,data);
 }
 
-WRITE16_HANDLER( YM2610_data_port_1_B_lsb_w ){
+WRITE16_HANDLER( ym2610_data_port_1_b_lsb_w ){
 	if (ACCESSING_BITS_0_7)
 	{
 		struct ym2610_info *info = sndti_token(chip_type,1);
-		YM2610Write(info->chip,3,data);
+		ym2610_write(info->chip,3,data);
 	}
 }
 
diff --git a/src/emu/sound/2610intf.h b/src/emu/sound/2610intf.h
index 89908f5fcf7..15ea2c61c86 100644
--- a/src/emu/sound/2610intf.h
+++ b/src/emu/sound/2610intf.h
@@ -1,8 +1,11 @@
+#pragma once
+
 #ifndef __2610INTF_H__
 #define __2610INTF_H__
 
 #include "fm.h"
 
+
 typedef struct _ym2610_interface ym2610_interface;
 struct _ym2610_interface
 {
@@ -12,38 +15,37 @@ struct _ym2610_interface
 /************************************************/
 /* Chip 0 functions                             */
 /************************************************/
-READ8_HANDLER( YM2610_status_port_0_A_r );
-READ16_HANDLER( YM2610_status_port_0_A_lsb_r );
-READ8_HANDLER( YM2610_status_port_0_B_r );
-READ16_HANDLER( YM2610_status_port_0_B_lsb_r );
-READ8_HANDLER( YM2610_read_port_0_r );
-READ16_HANDLER( YM2610_read_port_0_lsb_r );
-WRITE8_HANDLER( YM2610_control_port_0_A_w );
-WRITE16_HANDLER( YM2610_control_port_0_A_lsb_w );
-WRITE8_HANDLER( YM2610_control_port_0_B_w );
-WRITE16_HANDLER( YM2610_control_port_0_B_lsb_w );
-WRITE8_HANDLER( YM2610_data_port_0_A_w );
-WRITE16_HANDLER( YM2610_data_port_0_A_lsb_w );
-WRITE8_HANDLER( YM2610_data_port_0_B_w );
-WRITE16_HANDLER( YM2610_data_port_0_B_lsb_w );
+READ8_HANDLER( ym2610_status_port_0_a_r );
+READ16_HANDLER( ym2610_status_port_0_a_lsb_r );
+READ8_HANDLER( ym2610_status_port_0_b_r );
+READ16_HANDLER( ym2610_status_port_0_b_lsb_r );
+READ8_HANDLER( ym2610_read_port_0_r );
+READ16_HANDLER( ym2610_read_port_0_lsb_r );
+WRITE8_HANDLER( ym2610_control_port_0_a_w );
+WRITE16_HANDLER( ym2610_control_port_0_a_lsb_w );
+WRITE8_HANDLER( ym2610_control_port_0_b_w );
+WRITE16_HANDLER( ym2610_control_port_0_b_lsb_w );
+WRITE8_HANDLER( ym2610_data_port_0_a_w );
+WRITE16_HANDLER( ym2610_data_port_0_a_lsb_w );
+WRITE8_HANDLER( ym2610_data_port_0_b_w );
+WRITE16_HANDLER( ym2610_data_port_0_b_lsb_w );
 
 /************************************************/
 /* Chip 1 functions                             */
 /************************************************/
-READ8_HANDLER( YM2610_status_port_1_A_r );
-READ16_HANDLER( YM2610_status_port_1_A_lsb_r );
-READ8_HANDLER( YM2610_status_port_1_B_r );
-READ16_HANDLER( YM2610_status_port_1_B_lsb_r );
-READ8_HANDLER( YM2610_read_port_1_r );
-READ16_HANDLER( YM2610_read_port_1_lsb_r );
-WRITE8_HANDLER( YM2610_control_port_1_A_w );
-WRITE16_HANDLER( YM2610_control_port_1_A_lsb_w );
-WRITE8_HANDLER( YM2610_control_port_1_B_w );
-WRITE16_HANDLER( YM2610_control_port_1_B_lsb_w );
-WRITE8_HANDLER( YM2610_data_port_1_A_w );
-WRITE16_HANDLER( YM2610_data_port_1_A_lsb_w );
-WRITE8_HANDLER( YM2610_data_port_1_B_w );
-WRITE16_HANDLER( YM2610_data_port_1_B_lsb_w );
+READ8_HANDLER( ym2610_status_port_1_a_r );
+READ16_HANDLER( ym2610_status_port_1_a_lsb_r );
+READ8_HANDLER( ym2610_status_port_1_b_r );
+READ16_HANDLER( ym2610_status_port_1_b_lsb_r );
+READ8_HANDLER( ym2610_read_port_1_r );
+READ16_HANDLER( ym2610_read_port_1_lsb_r );
+WRITE8_HANDLER( ym2610_control_port_1_a_w );
+WRITE16_HANDLER( ym2610_control_port_1_a_lsb_w );
+WRITE8_HANDLER( ym2610_control_port_1_b_w );
+WRITE16_HANDLER( ym2610_control_port_1_b_lsb_w );
+WRITE8_HANDLER( ym2610_data_port_1_a_w );
+WRITE16_HANDLER( ym2610_data_port_1_a_lsb_w );
+WRITE8_HANDLER( ym2610_data_port_1_b_w );
+WRITE16_HANDLER( ym2610_data_port_1_b_lsb_w );
 
-#endif
-/**************** end of file ****************/
+#endif /* __2610INTF_H__ */
diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c
index cbbe18f73c8..4cd9d2ee03c 100644
--- a/src/emu/sound/2612intf.c
+++ b/src/emu/sound/2612intf.c
@@ -38,13 +38,13 @@ static void IRQHandler(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_2612_0 )
 {
 	struct ym2612_info *info = ptr;
-	YM2612TimerOver(info->chip,0);
+	ym2612_timer_over(info->chip,0);
 }
 
 static TIMER_CALLBACK( timer_callback_2612_1 )
 {
 	struct ym2612_info *info = ptr;
-	YM2612TimerOver(info->chip,1);
+	ym2612_timer_over(info->chip,1);
 }
 
 static void timer_handler(void *param,int c,int count,int clock)
@@ -63,7 +63,7 @@ static void timer_handler(void *param,int c,int count,int clock)
 }
 
 /* update request from fm.c */
-void YM2612UpdateRequest(void *param)
+void ym2612_update_request(void *param)
 {
 	struct ym2612_info *info = param;
 	stream_update(info->stream);
@@ -76,14 +76,14 @@ void YM2612UpdateRequest(void *param)
 static void ym2612_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ym2612_info *info = param;
-	YM2612UpdateOne(info->chip, buffers, length);
+	ym2612_update_one(info->chip, buffers, length);
 }
 
 
-static STATE_POSTLOAD( ym2612_postload )
+static STATE_POSTLOAD( ym2612_intf_postload )
 {
 	struct ym2612_info *info = param;
-	YM2612Postload(info->chip);
+	ym2612_postload(info->chip);
 }
 
 
@@ -107,9 +107,9 @@ static void *ym2612_start(const char *tag, int sndindex, int clock, const void *
 	info->stream = stream_create(0,2,rate,info,ym2612_stream_update);
 
 	/**** initialize YM2612 ****/
-	info->chip = YM2612Init(info,sndindex,clock,rate,timer_handler,IRQHandler);
+	info->chip = ym2612_init(info,sndindex,clock,rate,timer_handler,IRQHandler);
 
-	state_save_register_postload(Machine, ym2612_postload, info);
+	state_save_register_postload(Machine, ym2612_intf_postload, info);
 
 	if (info->chip)
 		return info;
@@ -121,117 +121,117 @@ static void *ym2612_start(const char *tag, int sndindex, int clock, const void *
 static void ym2612_stop(void *token)
 {
 	struct ym2612_info *info = token;
-	YM2612Shutdown(info->chip);
+	ym2612_shutdown(info->chip);
 }
 
 static void ym2612_reset(void *token)
 {
 	struct ym2612_info *info = token;
-	YM2612ResetChip(info->chip);
+	ym2612_reset_chip(info->chip);
 }
 
 
 /************************************************/
 /* Status Read for YM2612 - Chip 0              */
 /************************************************/
-READ8_HANDLER( YM2612_status_port_0_A_r )
+READ8_HANDLER( ym2612_status_port_0_a_r )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  return YM2612Read(info->chip,0);
+  return ym2612_read(info->chip,0);
 }
 
-READ8_HANDLER( YM2612_status_port_0_B_r )
+READ8_HANDLER( ym2612_status_port_0_b_r )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  return YM2612Read(info->chip,2);
+  return ym2612_read(info->chip,2);
 }
 
 /************************************************/
 /* Status Read for YM2612 - Chip 1              */
 /************************************************/
-READ8_HANDLER( YM2612_status_port_1_A_r ) {
+READ8_HANDLER( ym2612_status_port_1_a_r ) {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  return YM2612Read(info->chip,0);
+  return ym2612_read(info->chip,0);
 }
 
-READ8_HANDLER( YM2612_status_port_1_B_r ) {
+READ8_HANDLER( ym2612_status_port_1_b_r ) {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  return YM2612Read(info->chip,2);
+  return ym2612_read(info->chip,2);
 }
 
 /************************************************/
 /* Port Read for YM2612 - Chip 0                */
 /************************************************/
-READ8_HANDLER( YM2612_read_port_0_r ){
+READ8_HANDLER( ym2612_read_port_0_r ){
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  return YM2612Read(info->chip,1);
+  return ym2612_read(info->chip,1);
 }
 
 /************************************************/
 /* Port Read for YM2612 - Chip 1                */
 /************************************************/
-READ8_HANDLER( YM2612_read_port_1_r ){
+READ8_HANDLER( ym2612_read_port_1_r ){
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  return YM2612Read(info->chip,1);
+  return ym2612_read(info->chip,1);
 }
 
 /************************************************/
 /* Control Write for YM2612 - Chip 0            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2612_control_port_0_A_w )
+WRITE8_HANDLER( ym2612_control_port_0_a_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  YM2612Write(info->chip,0,data);
+  ym2612_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM2612_control_port_0_B_w )
+WRITE8_HANDLER( ym2612_control_port_0_b_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  YM2612Write(info->chip,2,data);
+  ym2612_write(info->chip,2,data);
 }
 
 /************************************************/
 /* Control Write for YM2612 - Chip 1            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2612_control_port_1_A_w ){
+WRITE8_HANDLER( ym2612_control_port_1_a_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  YM2612Write(info->chip,0,data);
+  ym2612_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM2612_control_port_1_B_w ){
+WRITE8_HANDLER( ym2612_control_port_1_b_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  YM2612Write(info->chip,2,data);
+  ym2612_write(info->chip,2,data);
 }
 
 /************************************************/
 /* Data Write for YM2612 - Chip 0               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2612_data_port_0_A_w )
+WRITE8_HANDLER( ym2612_data_port_0_a_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  YM2612Write(info->chip,1,data);
+  ym2612_write(info->chip,1,data);
 }
 
-WRITE8_HANDLER( YM2612_data_port_0_B_w )
+WRITE8_HANDLER( ym2612_data_port_0_b_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM2612,0);
-  YM2612Write(info->chip,3,data);
+  ym2612_write(info->chip,3,data);
 }
 
 /************************************************/
 /* Data Write for YM2612 - Chip 1               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM2612_data_port_1_A_w ){
+WRITE8_HANDLER( ym2612_data_port_1_a_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  YM2612Write(info->chip,1,data);
+  ym2612_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM2612_data_port_1_B_w ){
+WRITE8_HANDLER( ym2612_data_port_1_b_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM2612,1);
-  YM2612Write(info->chip,3,data);
+  ym2612_write(info->chip,3,data);
 }
 
 #if BUILD_YM3438
@@ -239,104 +239,104 @@ WRITE8_HANDLER( YM2612_data_port_1_B_w ){
 /************************************************/
 /* Status Read for YM3438 - Chip 0              */
 /************************************************/
-READ8_HANDLER( YM3438_status_port_0_A_r )
+READ8_HANDLER( ym3438_status_port_0_a_r )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  return YM2612Read(info->chip,0);
+  return ym2612_read(info->chip,0);
 }
 
-READ8_HANDLER( YM3438_status_port_0_B_r )
+READ8_HANDLER( ym3438_status_port_0_b_r )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  return YM2612Read(info->chip,2);
+  return ym2612_read(info->chip,2);
 }
 
 /************************************************/
 /* Status Read for YM3438 - Chip 1              */
 /************************************************/
-READ8_HANDLER( YM3438_status_port_1_A_r ) {
+READ8_HANDLER( ym3438_status_port_1_a_r ) {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  return YM2612Read(info->chip,0);
+  return ym2612_read(info->chip,0);
 }
 
-READ8_HANDLER( YM3438_status_port_1_B_r ) {
+READ8_HANDLER( ym3438_status_port_1_b_r ) {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  return YM2612Read(info->chip,2);
+  return ym2612_read(info->chip,2);
 }
 
 /************************************************/
 /* Port Read for YM3438 - Chip 0                */
 /************************************************/
-READ8_HANDLER( YM3438_read_port_0_r ){
+READ8_HANDLER( ym3438_read_port_0_r ){
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  return YM2612Read(info->chip,1);
+  return ym2612_read(info->chip,1);
 }
 
 /************************************************/
 /* Port Read for YM3438 - Chip 1                */
 /************************************************/
-READ8_HANDLER( YM3438_read_port_1_r ){
+READ8_HANDLER( ym3438_read_port_1_r ){
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  return YM2612Read(info->chip,1);
+  return ym2612_read(info->chip,1);
 }
 
 /************************************************/
 /* Control Write for YM3438 - Chip 0            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM3438_control_port_0_A_w )
+WRITE8_HANDLER( ym3438_control_port_0_a_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  YM2612Write(info->chip,0,data);
+  ym2612_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM3438_control_port_0_B_w )
+WRITE8_HANDLER( ym3438_control_port_0_b_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  YM2612Write(info->chip,2,data);
+  ym2612_write(info->chip,2,data);
 }
 
 /************************************************/
 /* Control Write for YM3438 - Chip 1            */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM3438_control_port_1_A_w ){
+WRITE8_HANDLER( ym3438_control_port_1_a_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  YM2612Write(info->chip,0,data);
+  ym2612_write(info->chip,0,data);
 }
 
-WRITE8_HANDLER( YM3438_control_port_1_B_w ){
+WRITE8_HANDLER( ym3438_control_port_1_b_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  YM2612Write(info->chip,2,data);
+  ym2612_write(info->chip,2,data);
 }
 
 /************************************************/
 /* Data Write for YM3438 - Chip 0               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM3438_data_port_0_A_w )
+WRITE8_HANDLER( ym3438_data_port_0_a_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  YM2612Write(info->chip,1,data);
+  ym2612_write(info->chip,1,data);
 }
 
-WRITE8_HANDLER( YM3438_data_port_0_B_w )
+WRITE8_HANDLER( ym3438_data_port_0_b_w )
 {
   struct ym2612_info *info = sndti_token(SOUND_YM3438,0);
-  YM2612Write(info->chip,3,data);
+  ym2612_write(info->chip,3,data);
 }
 
 /************************************************/
 /* Data Write for YM3438 - Chip 1               */
 /* Consists of 2 addresses                      */
 /************************************************/
-WRITE8_HANDLER( YM3438_data_port_1_A_w ){
+WRITE8_HANDLER( ym3438_data_port_1_a_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  YM2612Write(info->chip,1,data);
+  ym2612_write(info->chip,1,data);
 }
-WRITE8_HANDLER( YM3438_data_port_1_B_w ){
+WRITE8_HANDLER( ym3438_data_port_1_b_w ){
   struct ym2612_info *info = sndti_token(SOUND_YM3438,1);
-  YM2612Write(info->chip,3,data);
+  ym2612_write(info->chip,3,data);
 }
 
 #endif
diff --git a/src/emu/sound/2612intf.h b/src/emu/sound/2612intf.h
index c83a51b51fd..c52202067db 100644
--- a/src/emu/sound/2612intf.h
+++ b/src/emu/sound/2612intf.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef __2612INTF_H__
 #define __2612INTF_H__
 
@@ -11,28 +13,29 @@ struct _ym2612_interface
 /************************************************/
 /* Chip 0 functions                             */
 /************************************************/
-READ8_HANDLER( YM2612_status_port_0_A_r );  /* A=0 : OPN status */
-READ8_HANDLER( YM2612_status_port_0_B_r );  /* A=2 : don't care */
-READ8_HANDLER( YM2612_read_port_0_r );        /* A=1 : don't care */
-WRITE8_HANDLER( YM2612_control_port_0_A_w ); /* A=0:OPN  address */
-WRITE8_HANDLER( YM2612_control_port_0_B_w ); /* A=2:OPN2 address */
-WRITE8_HANDLER( YM2612_data_port_0_A_w );    /* A=1:OPN  data    */
-WRITE8_HANDLER( YM2612_data_port_0_B_w );    /* A=3:OPN2 data    */
+READ8_HANDLER( ym2612_status_port_0_a_r );  /* A=0 : OPN status */
+READ8_HANDLER( ym2612_status_port_0_b_r );  /* A=2 : don't care */
+READ8_HANDLER( ym2612_read_port_0_r );        /* A=1 : don't care */
+WRITE8_HANDLER( ym2612_control_port_0_a_w ); /* A=0:OPN  address */
+WRITE8_HANDLER( ym2612_control_port_0_b_w ); /* A=2:OPN2 address */
+WRITE8_HANDLER( ym2612_data_port_0_a_w );    /* A=1:OPN  data    */
+WRITE8_HANDLER( ym2612_data_port_0_b_w );    /* A=3:OPN2 data    */
 
 /************************************************/
 /* Chip 1 functions                             */
 /************************************************/
-READ8_HANDLER( YM2612_status_port_1_A_r );
-READ8_HANDLER( YM2612_status_port_1_B_r );
-READ8_HANDLER( YM2612_read_port_1_r );
-WRITE8_HANDLER( YM2612_control_port_1_A_w );
-WRITE8_HANDLER( YM2612_control_port_1_B_w );
-WRITE8_HANDLER( YM2612_data_port_1_A_w );
-WRITE8_HANDLER( YM2612_data_port_1_B_w );
+READ8_HANDLER( ym2612_status_port_1_a_r );
+READ8_HANDLER( ym2612_status_port_1_b_r );
+READ8_HANDLER( ym2612_read_port_1_r );
+WRITE8_HANDLER( ym2612_control_port_1_a_w );
+WRITE8_HANDLER( ym2612_control_port_1_b_w );
+WRITE8_HANDLER( ym2612_data_port_1_a_w );
+WRITE8_HANDLER( ym2612_data_port_1_b_w );
 
 
 
-struct YM3438interface
+typedef struct _ym3438_interface ym3438_interface;
+struct _ym3438_interface
 {
 	void (*handler)(running_machine *machine, int irq);
 };
@@ -41,25 +44,24 @@ struct YM3438interface
 /************************************************/
 /* Chip 0 functions                             */
 /************************************************/
-READ8_HANDLER( YM3438_status_port_0_A_r );  /* A=0 : OPN status */
-READ8_HANDLER( YM3438_status_port_0_B_r );  /* A=2 : don't care */
-READ8_HANDLER( YM3438_read_port_0_r );        /* A=1 : don't care */
-WRITE8_HANDLER( YM3438_control_port_0_A_w ); /* A=0:OPN  address */
-WRITE8_HANDLER( YM3438_control_port_0_B_w ); /* A=2:OPN2 address */
-WRITE8_HANDLER( YM3438_data_port_0_A_w );    /* A=1:OPN  data    */
-WRITE8_HANDLER( YM3438_data_port_0_B_w );    /* A=3:OPN2 data    */
+READ8_HANDLER( ym3438_status_port_0_a_r );  /* A=0 : OPN status */
+READ8_HANDLER( ym3438_status_port_0_b_r );  /* A=2 : don't care */
+READ8_HANDLER( ym3438_read_port_0_r );        /* A=1 : don't care */
+WRITE8_HANDLER( ym3438_control_port_0_a_w ); /* A=0:OPN  address */
+WRITE8_HANDLER( ym3438_control_port_0_b_w ); /* A=2:OPN2 address */
+WRITE8_HANDLER( ym3438_data_port_0_a_w );    /* A=1:OPN  data    */
+WRITE8_HANDLER( ym3438_data_port_0_b_w );    /* A=3:OPN2 data    */
 
 /************************************************/
 /* Chip 1 functions                             */
 /************************************************/
-READ8_HANDLER( YM3438_status_port_1_A_r );
-READ8_HANDLER( YM3438_status_port_1_B_r );
-READ8_HANDLER( YM3438_read_port_1_r );
-WRITE8_HANDLER( YM3438_control_port_1_A_w );
-WRITE8_HANDLER( YM3438_control_port_1_B_w );
-WRITE8_HANDLER( YM3438_data_port_1_A_w );
-WRITE8_HANDLER( YM3438_data_port_1_B_w );
+READ8_HANDLER( ym3438_status_port_1_a_r );
+READ8_HANDLER( ym3438_status_port_1_b_r );
+READ8_HANDLER( ym3438_read_port_1_r );
+WRITE8_HANDLER( ym3438_control_port_1_a_w );
+WRITE8_HANDLER( ym3438_control_port_1_b_w );
+WRITE8_HANDLER( ym3438_data_port_1_a_w );
+WRITE8_HANDLER( ym3438_data_port_1_b_w );
 
 
-#endif
-/**************** end of file ****************/
+#endif /* __2612INTF_H__ */
diff --git a/src/emu/sound/262intf.c b/src/emu/sound/262intf.c
index 409b91321e9..02b26ec7496 100644
--- a/src/emu/sound/262intf.c
+++ b/src/emu/sound/262intf.c
@@ -32,13 +32,13 @@ static void IRQHandler_262(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_262_0 )
 {
 	struct ymf262_info *info = ptr;
-	YMF262TimerOver(info->chip, 0);
+	ymf262_timer_over(info->chip, 0);
 }
 
 static TIMER_CALLBACK( timer_callback_262_1 )
 {
 	struct ymf262_info *info = ptr;
-	YMF262TimerOver(info->chip, 1);
+	ymf262_timer_over(info->chip, 1);
 }
 
 static void timer_handler_262(void *param,int timer, attotime period)
@@ -57,7 +57,7 @@ static void timer_handler_262(void *param,int timer, attotime period)
 static void ymf262_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffers, int length)
 {
 	struct ymf262_info *info = param;
-	YMF262UpdateOne(info->chip, buffers, length);
+	ymf262_update_one(info->chip, buffers, length);
 }
 
 static void _stream_update(void *param, int interval)
@@ -79,16 +79,16 @@ static void *ymf262_start(const char *tag, int sndindex, int clock, const void *
 	info->intf = config ? config : &dummy;
 
 	/* stream system initialize */
-	info->chip = YMF262Init(clock,rate);
+	info->chip = ymf262_init(clock,rate);
 	if (info->chip == NULL)
 		return NULL;
 
 	info->stream = stream_create(0,4,rate,info,ymf262_stream_update);
 
 	/* YMF262 setup */
-	YMF262SetTimerHandler (info->chip, timer_handler_262, info);
-	YMF262SetIRQHandler   (info->chip, IRQHandler_262, info);
-	YMF262SetUpdateHandler(info->chip, _stream_update, info);
+	ymf262_set_timer_handler (info->chip, timer_handler_262, info);
+	ymf262_set_irq_handler   (info->chip, IRQHandler_262, info);
+	ymf262_set_update_handler(info->chip, _stream_update, info);
 
 	info->timer[0] = timer_alloc(timer_callback_262_0, info);
 	info->timer[1] = timer_alloc(timer_callback_262_1, info);
@@ -99,58 +99,58 @@ static void *ymf262_start(const char *tag, int sndindex, int clock, const void *
 static void ymf262_stop(void *token)
 {
 	struct ymf262_info *info = token;
-	YMF262Shutdown(info->chip);
+	ymf262_shutdown(info->chip);
 }
 
 /* reset */
 static void ymf262_reset(void *token)
 {
 	struct ymf262_info *info = token;
-	YMF262ResetChip(info->chip);
+	ymf262_reset_chip(info->chip);
 }
 
 /* chip #0 */
-READ8_HANDLER( YMF262_status_0_r ) {
+READ8_HANDLER( ymf262_status_0_r ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 0);
-	return YMF262Read(info->chip, 0);
+	return ymf262_read(info->chip, 0);
 }
-WRITE8_HANDLER( YMF262_register_A_0_w ) {
+WRITE8_HANDLER( ymf262_register_a_0_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 0);
-	YMF262Write(info->chip, 0, data);
+	ymf262_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( YMF262_data_A_0_w ) {
+WRITE8_HANDLER( ymf262_data_a_0_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 0);
-	YMF262Write(info->chip, 1, data);
+	ymf262_write(info->chip, 1, data);
 }
-WRITE8_HANDLER( YMF262_register_B_0_w ) {
+WRITE8_HANDLER( ymf262_register_b_0_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 0);
-	YMF262Write(info->chip, 2, data);
+	ymf262_write(info->chip, 2, data);
 }
-WRITE8_HANDLER( YMF262_data_B_0_w ) {
+WRITE8_HANDLER( ymf262_data_b_0_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 0);
-	YMF262Write(info->chip, 3, data);
+	ymf262_write(info->chip, 3, data);
 }
 
 /* chip #1 */
-READ8_HANDLER( YMF262_status_1_r ) {
+READ8_HANDLER( ymf262_status_1_r ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 1);
-	return YMF262Read(info->chip, 0);
+	return ymf262_read(info->chip, 0);
 }
-WRITE8_HANDLER( YMF262_register_A_1_w ) {
+WRITE8_HANDLER( ymf262_register_a_1_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 1);
-	YMF262Write(info->chip, 0, data);
+	ymf262_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( YMF262_data_A_1_w ) {
+WRITE8_HANDLER( ymf262_data_a_1_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 1);
-	YMF262Write(info->chip, 1, data);
+	ymf262_write(info->chip, 1, data);
 }
-WRITE8_HANDLER( YMF262_register_B_1_w ) {
+WRITE8_HANDLER( ymf262_register_b_1_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 1);
-	YMF262Write(info->chip, 2, data);
+	ymf262_write(info->chip, 2, data);
 }
-WRITE8_HANDLER( YMF262_data_B_1_w ) {
+WRITE8_HANDLER( ymf262_data_b_1_w ) {
 	struct ymf262_info *info = sndti_token(SOUND_YMF262, 1);
-	YMF262Write(info->chip, 3, data);
+	ymf262_write(info->chip, 3, data);
 }
 
 
diff --git a/src/emu/sound/262intf.h b/src/emu/sound/262intf.h
index 7d42e0913a1..bcacab3436b 100644
--- a/src/emu/sound/262intf.h
+++ b/src/emu/sound/262intf.h
@@ -1,5 +1,7 @@
-#ifndef YMF262INTF_H
-#define YMF262INTF_H
+#pragma once
+	
+#ifndef __262INTF_H__
+#define __262INTF_H__
 
 
 typedef struct _ymf262_interface ymf262_interface;
@@ -11,18 +13,18 @@ struct _ymf262_interface
 
 
 /* YMF262 */
-READ8_HANDLER ( YMF262_status_0_r );
-WRITE8_HANDLER( YMF262_register_A_0_w );
-WRITE8_HANDLER( YMF262_register_B_0_w );
-WRITE8_HANDLER( YMF262_data_A_0_w );
-WRITE8_HANDLER( YMF262_data_B_0_w );
+READ8_HANDLER ( ymf262_status_0_r );
+WRITE8_HANDLER( ymf262_register_a_0_w );
+WRITE8_HANDLER( ymf262_register_b_0_w );
+WRITE8_HANDLER( ymf262_data_a_0_w );
+WRITE8_HANDLER( ymf262_data_b_0_w );
 
 
-READ8_HANDLER ( YMF262_status_1_r );
-WRITE8_HANDLER( YMF262_register_A_1_w );
-WRITE8_HANDLER( YMF262_register_B_1_w );
-WRITE8_HANDLER( YMF262_data_A_1_w );
-WRITE8_HANDLER( YMF262_data_B_1_w );
+READ8_HANDLER ( ymf262_status_1_r );
+WRITE8_HANDLER( ymf262_register_a_1_w );
+WRITE8_HANDLER( ymf262_register_b_1_w );
+WRITE8_HANDLER( ymf262_data_a_1_w );
+WRITE8_HANDLER( ymf262_data_b_1_w );
 
 
-#endif
+#endif /* __262INTF_H__ */
diff --git a/src/emu/sound/3812intf.c b/src/emu/sound/3812intf.c
index c1da34089b4..b7131a5e90a 100644
--- a/src/emu/sound/3812intf.c
+++ b/src/emu/sound/3812intf.c
@@ -43,13 +43,13 @@ static void IRQHandler_3812(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_3812_0 )
 {
 	struct ym3812_info *info = ptr;
-	YM3812TimerOver(info->chip,0);
+	ym3812_timer_over(info->chip,0);
 }
 
 static TIMER_CALLBACK( timer_callback_3812_1 )
 {
 	struct ym3812_info *info = ptr;
-	YM3812TimerOver(info->chip,1);
+	ym3812_timer_over(info->chip,1);
 }
 
 static void TimerHandler_3812(void *param,int c,attotime period)
@@ -69,7 +69,7 @@ static void TimerHandler_3812(void *param,int c,attotime period)
 static void ym3812_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
 {
 	struct ym3812_info *info = param;
-	YM3812UpdateOne(info->chip, buffer[0], length);
+	ym3812_update_one(info->chip, buffer[0], length);
 }
 
 static void _stream_update_3812(void * param, int interval)
@@ -91,16 +91,16 @@ static void *ym3812_start(const char *tag, int sndindex, int clock, const void *
 	info->intf = config ? config : &dummy;
 
 	/* stream system initialize */
-	info->chip = YM3812Init(sndindex,clock,rate);
+	info->chip = ym3812_init(sndindex,clock,rate);
 	if (!info->chip)
 		return NULL;
 
 	info->stream = stream_create(0,1,rate,info,ym3812_stream_update);
 
 	/* YM3812 setup */
-	YM3812SetTimerHandler (info->chip, TimerHandler_3812, info);
-	YM3812SetIRQHandler   (info->chip, IRQHandler_3812, info);
-	YM3812SetUpdateHandler(info->chip, _stream_update_3812, info);
+	ym3812_set_timer_handler (info->chip, TimerHandler_3812, info);
+	ym3812_set_irq_handler   (info->chip, IRQHandler_3812, info);
+	ym3812_set_update_handler(info->chip, _stream_update_3812, info);
 
 	info->timer[0] = timer_alloc(timer_callback_3812_0, info);
 	info->timer[1] = timer_alloc(timer_callback_3812_1, info);
@@ -111,48 +111,48 @@ static void *ym3812_start(const char *tag, int sndindex, int clock, const void *
 static void ym3812_stop(void *token)
 {
 	struct ym3812_info *info = token;
-	YM3812Shutdown(info->chip);
+	ym3812_shutdown(info->chip);
 }
 
 static void ym3812_reset(void *token)
 {
 	struct ym3812_info *info = token;
-	YM3812ResetChip(info->chip);
+	ym3812_reset_chip(info->chip);
 }
 
-WRITE8_HANDLER( YM3812_control_port_0_w ) {
+WRITE8_HANDLER( ym3812_control_port_0_w ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 0);
-	YM3812Write(info->chip, 0, data);
+	ym3812_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( YM3812_write_port_0_w ) {
+WRITE8_HANDLER( ym3812_write_port_0_w ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 0);
-	YM3812Write(info->chip, 1, data);
+	ym3812_write(info->chip, 1, data);
 }
-READ8_HANDLER( YM3812_status_port_0_r ) {
+READ8_HANDLER( ym3812_status_port_0_r ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 0);
-	return YM3812Read(info->chip, 0);
+	return ym3812_read(info->chip, 0);
 }
-READ8_HANDLER( YM3812_read_port_0_r ) {
+READ8_HANDLER( ym3812_read_port_0_r ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 0);
-	return YM3812Read(info->chip, 1);
+	return ym3812_read(info->chip, 1);
 }
 
 
-WRITE8_HANDLER( YM3812_control_port_1_w ) {
+WRITE8_HANDLER( ym3812_control_port_1_w ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 1);
-	YM3812Write(info->chip, 0, data);
+	ym3812_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( YM3812_write_port_1_w ) {
+WRITE8_HANDLER( ym3812_write_port_1_w ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 1);
-	YM3812Write(info->chip, 1, data);
+	ym3812_write(info->chip, 1, data);
 }
-READ8_HANDLER( YM3812_status_port_1_r ) {
+READ8_HANDLER( ym3812_status_port_1_r ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 1);
-	return YM3812Read(info->chip, 0);
+	return ym3812_read(info->chip, 0);
 }
-READ8_HANDLER( YM3812_read_port_1_r ) {
+READ8_HANDLER( ym3812_read_port_1_r ) {
 	struct ym3812_info *info = sndti_token(SOUND_YM3812, 1);
-	return YM3812Read(info->chip, 1);
+	return ym3812_read(info->chip, 1);
 }
 
 /**************************************************************************
@@ -213,12 +213,12 @@ static void IRQHandler_3526(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_3526_0 )
 {
 	struct ym3526_info *info = ptr;
-	YM3526TimerOver(info->chip,0);
+	ym3526_timer_over(info->chip,0);
 }
 static TIMER_CALLBACK( timer_callback_3526_1 )
 {
 	struct ym3526_info *info = ptr;
-	YM3526TimerOver(info->chip,1);
+	ym3526_timer_over(info->chip,1);
 }
 /* TimerHandler from fm.c */
 static void TimerHandler_3526(void *param,int c,attotime period)
@@ -238,7 +238,7 @@ static void TimerHandler_3526(void *param,int c,attotime period)
 static void ym3526_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
 {
 	struct ym3526_info *info = param;
-	YM3526UpdateOne(info->chip, buffer[0], length);
+	ym3526_update_one(info->chip, buffer[0], length);
 }
 
 static void _stream_update_3526(void *param, int interval)
@@ -260,15 +260,15 @@ static void *ym3526_start(const char *tag, int sndindex, int clock, const void *
 	info->intf = config ? config : &dummy;
 
 	/* stream system initialize */
-	info->chip = YM3526Init(sndindex,clock,rate);
+	info->chip = ym3526_init(sndindex,clock,rate);
 	if (!info->chip)
 		return NULL;
 
 	info->stream = stream_create(0,1,rate,info,ym3526_stream_update);
 	/* YM3526 setup */
-	YM3526SetTimerHandler (info->chip, TimerHandler_3526, info);
-	YM3526SetIRQHandler   (info->chip, IRQHandler_3526, info);
-	YM3526SetUpdateHandler(info->chip, _stream_update_3526, info);
+	ym3526_set_timer_handler (info->chip, TimerHandler_3526, info);
+	ym3526_set_irq_handler   (info->chip, IRQHandler_3526, info);
+	ym3526_set_update_handler(info->chip, _stream_update_3526, info);
 
 	info->timer[0] = timer_alloc(timer_callback_3526_0, info);
 	info->timer[1] = timer_alloc(timer_callback_3526_1, info);
@@ -279,48 +279,48 @@ static void *ym3526_start(const char *tag, int sndindex, int clock, const void *
 static void ym3526_stop(void *token)
 {
 	struct ym3526_info *info = token;
-	YM3526Shutdown(info->chip);
+	ym3526_shutdown(info->chip);
 }
 
 static void ym3526_reset(void *token)
 {
 	struct ym3526_info *info = token;
-	YM3526ResetChip(info->chip);
+	ym3526_reset_chip(info->chip);
 }
 
-WRITE8_HANDLER( YM3526_control_port_0_w ) {
+WRITE8_HANDLER( ym3526_control_port_0_w ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 0);
-	YM3526Write(info->chip, 0, data);
+	ym3526_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( YM3526_write_port_0_w ) {
+WRITE8_HANDLER( ym3526_write_port_0_w ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 0);
-	YM3526Write(info->chip, 1, data);
+	ym3526_write(info->chip, 1, data);
 }
-READ8_HANDLER( YM3526_status_port_0_r ) {
+READ8_HANDLER( ym3526_status_port_0_r ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 0);
-	return YM3526Read(info->chip, 0);
+	return ym3526_read(info->chip, 0);
 }
-READ8_HANDLER( YM3526_read_port_0_r ) {
+READ8_HANDLER( ym3526_read_port_0_r ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 0);
-	return YM3526Read(info->chip, 1);
+	return ym3526_read(info->chip, 1);
 }
 
 
-WRITE8_HANDLER( YM3526_control_port_1_w ) {
+WRITE8_HANDLER( ym3526_control_port_1_w ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 1);
-	YM3526Write(info->chip, 0, data);
+	ym3526_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( YM3526_write_port_1_w ) {
+WRITE8_HANDLER( ym3526_write_port_1_w ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 1);
-	YM3526Write(info->chip, 1, data);
+	ym3526_write(info->chip, 1, data);
 }
-READ8_HANDLER( YM3526_status_port_1_r ) {
+READ8_HANDLER( ym3526_status_port_1_r ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 1);
-	return YM3526Read(info->chip, 0);
+	return ym3526_read(info->chip, 0);
 }
-READ8_HANDLER( YM3526_read_port_1_r ) {
+READ8_HANDLER( ym3526_read_port_1_r ) {
 	struct ym3526_info *info = sndti_token(SOUND_YM3526, 1);
-	return YM3526Read(info->chip, 1);
+	return ym3526_read(info->chip, 1);
 }
 
 /**************************************************************************
@@ -379,12 +379,12 @@ static void IRQHandler_8950(void *param,int irq)
 static TIMER_CALLBACK( timer_callback_8950_0 )
 {
 	struct y8950_info *info = ptr;
-	Y8950TimerOver(info->chip,0);
+	y8950_timer_over(info->chip,0);
 }
 static TIMER_CALLBACK( timer_callback_8950_1 )
 {
 	struct y8950_info *info = ptr;
-	Y8950TimerOver(info->chip,1);
+	y8950_timer_over(info->chip,1);
 }
 static void TimerHandler_8950(void *param,int c,attotime period)
 {
@@ -433,7 +433,7 @@ static void Y8950KeyboardHandler_w(void *param,unsigned char data)
 static void y8950_stream_update(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
 {
 	struct y8950_info *info = param;
-	Y8950UpdateOne(info->chip, buffer[0], length);
+	y8950_update_one(info->chip, buffer[0], length);
 }
 
 static void _stream_update_8950(void *param, int interval)
@@ -456,25 +456,25 @@ static void *y8950_start(const char *tag, int sndindex, int clock, const void *c
 	info->index = sndindex;
 
 	/* stream system initialize */
-	info->chip = Y8950Init(sndindex,clock,rate);
+	info->chip = y8950_init(sndindex,clock,rate);
 	if (!info->chip)
 		return NULL;
 
 	/* ADPCM ROM data */
-	Y8950SetDeltaTMemory(info->chip,
+	y8950_set_delta_t_memory(info->chip,
 		(void *)(memory_region(Machine, tag)),
 			memory_region_length(Machine, tag) );
 
 	info->stream = stream_create(0,1,rate,info,y8950_stream_update);
 
 	/* port and keyboard handler */
-	Y8950SetPortHandler(info->chip, Y8950PortHandler_w, Y8950PortHandler_r, info);
-	Y8950SetKeyboardHandler(info->chip, Y8950KeyboardHandler_w, Y8950KeyboardHandler_r, info);
+	y8950_set_port_handler(info->chip, Y8950PortHandler_w, Y8950PortHandler_r, info);
+	y8950_set_keyboard_handler(info->chip, Y8950KeyboardHandler_w, Y8950KeyboardHandler_r, info);
 
 	/* Y8950 setup */
-	Y8950SetTimerHandler (info->chip, TimerHandler_8950, info);
-	Y8950SetIRQHandler   (info->chip, IRQHandler_8950, info);
-	Y8950SetUpdateHandler(info->chip, _stream_update_8950, info);
+	y8950_set_timer_handler (info->chip, TimerHandler_8950, info);
+	y8950_set_irq_handler   (info->chip, IRQHandler_8950, info);
+	y8950_set_update_handler(info->chip, _stream_update_8950, info);
 
 	info->timer[0] = timer_alloc(timer_callback_8950_0, info);
 	info->timer[1] = timer_alloc(timer_callback_8950_1, info);
@@ -485,48 +485,48 @@ static void *y8950_start(const char *tag, int sndindex, int clock, const void *c
 static void y8950_stop(void *token)
 {
 	struct y8950_info *info = token;
-	Y8950Shutdown(info->chip);
+	y8950_shutdown(info->chip);
 }
 
 static void y8950_reset(void *token)
 {
 	struct y8950_info *info = token;
-	Y8950ResetChip(info->chip);
+	y8950_reset_chip(info->chip);
 }
 
-WRITE8_HANDLER( Y8950_control_port_0_w ) {
+WRITE8_HANDLER( y8950_control_port_0_w ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 0);
-	Y8950Write(info->chip, 0, data);
+	y8950_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( Y8950_write_port_0_w ) {
+WRITE8_HANDLER( y8950_write_port_0_w ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 0);
-	Y8950Write(info->chip, 1, data);
+	y8950_write(info->chip, 1, data);
 }
-READ8_HANDLER( Y8950_status_port_0_r ) {
+READ8_HANDLER( y8950_status_port_0_r ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 0);
-	return Y8950Read(info->chip, 0);
+	return y8950_read(info->chip, 0);
 }
-READ8_HANDLER( Y8950_read_port_0_r ) {
+READ8_HANDLER( y8950_read_port_0_r ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 0);
-	return Y8950Read(info->chip, 1);
+	return y8950_read(info->chip, 1);
 }
 
 
-WRITE8_HANDLER( Y8950_control_port_1_w ) {
+WRITE8_HANDLER( y8950_control_port_1_w ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 1);
-	Y8950Write(info->chip, 0, data);
+	y8950_write(info->chip, 0, data);
 }
-WRITE8_HANDLER( Y8950_write_port_1_w ) {
+WRITE8_HANDLER( y8950_write_port_1_w ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 1);
-	Y8950Write(info->chip, 1, data);
+	y8950_write(info->chip, 1, data);
 }
-READ8_HANDLER( Y8950_status_port_1_r ) {
+READ8_HANDLER( y8950_status_port_1_r ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 1);
-	return Y8950Read(info->chip, 0);
+	return y8950_read(info->chip, 0);
 }
-READ8_HANDLER( Y8950_read_port_1_r ) {
+READ8_HANDLER( y8950_read_port_1_r ) {
 	struct y8950_info *info = sndti_token(SOUND_Y8950, 1);
-	return Y8950Read(info->chip, 1);
+	return y8950_read(info->chip, 1);
 }
 
 /**************************************************************************
diff --git a/src/emu/sound/3812intf.h b/src/emu/sound/3812intf.h
index 7f6f2e439ea..f6564456a25 100644
--- a/src/emu/sound/3812intf.h
+++ b/src/emu/sound/3812intf.h
@@ -1,5 +1,7 @@
-#ifndef YM3812INTF_H
-#define YM3812INTF_H
+#pragma once
+
+#ifndef __3812INTF_H__
+#define __3812INTF_H__
 
 
 typedef struct _ym3812_interface ym3812_interface;
@@ -23,38 +25,38 @@ struct _y8950_interface
 
 
 /* YM3812 */
-READ8_HANDLER ( YM3812_status_port_0_r );
-WRITE8_HANDLER( YM3812_control_port_0_w );
-READ8_HANDLER( YM3812_read_port_0_r );
-WRITE8_HANDLER( YM3812_write_port_0_w );
+READ8_HANDLER ( ym3812_status_port_0_r );
+WRITE8_HANDLER( ym3812_control_port_0_w );
+READ8_HANDLER( ym3812_read_port_0_r );
+WRITE8_HANDLER( ym3812_write_port_0_w );
 
-READ8_HANDLER ( YM3812_status_port_1_r );
-WRITE8_HANDLER( YM3812_control_port_1_w );
-READ8_HANDLER( YM3812_read_port_1_r );
-WRITE8_HANDLER( YM3812_write_port_1_w );
+READ8_HANDLER ( ym3812_status_port_1_r );
+WRITE8_HANDLER( ym3812_control_port_1_w );
+READ8_HANDLER( ym3812_read_port_1_r );
+WRITE8_HANDLER( ym3812_write_port_1_w );
 
 
 /* YM3526 */
-READ8_HANDLER ( YM3526_status_port_0_r );
-WRITE8_HANDLER( YM3526_control_port_0_w );
-READ8_HANDLER( YM3526_read_port_0_r );
-WRITE8_HANDLER( YM3526_write_port_0_w );
+READ8_HANDLER ( ym3526_status_port_0_r );
+WRITE8_HANDLER( ym3526_control_port_0_w );
+READ8_HANDLER( ym3526_read_port_0_r );
+WRITE8_HANDLER( ym3526_write_port_0_w );
 
-READ8_HANDLER ( YM3526_status_port_1_r );
-WRITE8_HANDLER( YM3526_control_port_1_w );
-READ8_HANDLER( YM3526_read_port_1_r );
-WRITE8_HANDLER( YM3526_write_port_1_w );
+READ8_HANDLER ( ym3526_status_port_1_r );
+WRITE8_HANDLER( ym3526_control_port_1_w );
+READ8_HANDLER( ym3526_read_port_1_r );
+WRITE8_HANDLER( ym3526_write_port_1_w );
 
 
 /* Y8950 */
-READ8_HANDLER ( Y8950_status_port_0_r );
-WRITE8_HANDLER( Y8950_control_port_0_w );
-READ8_HANDLER ( Y8950_read_port_0_r );
-WRITE8_HANDLER( Y8950_write_port_0_w );
+READ8_HANDLER ( y8950_status_port_0_r );
+WRITE8_HANDLER( y8950_control_port_0_w );
+READ8_HANDLER ( y8950_read_port_0_r );
+WRITE8_HANDLER( y8950_write_port_0_w );
 
-READ8_HANDLER ( Y8950_status_port_1_r );
-WRITE8_HANDLER( Y8950_control_port_1_w );
-READ8_HANDLER ( Y8950_read_port_1_r );
-WRITE8_HANDLER( Y8950_write_port_1_w );
+READ8_HANDLER ( y8950_status_port_1_r );
+WRITE8_HANDLER( y8950_control_port_1_w );
+READ8_HANDLER ( y8950_read_port_1_r );
+WRITE8_HANDLER( y8950_write_port_1_w );
 
-#endif
+#endif /* __3812INTF_H__ */
diff --git a/src/emu/sound/5110intf.c b/src/emu/sound/5110intf.c
index a20fd7bdacf..00750c00231 100644
--- a/src/emu/sound/5110intf.c
+++ b/src/emu/sound/5110intf.c
@@ -173,12 +173,12 @@ static void tms5110_reset(void *chip)
 
 /******************************************************************************
 
-     tms5110_CTL_w -- write Control Command to the sound chip
+     tms5110_ctl_w -- write Control Command to the sound chip
 commands like Speech, Reset, etc., are loaded into the chip via the CTL pins
 
 ******************************************************************************/
 
-WRITE8_HANDLER( tms5110_CTL_w )
+WRITE8_HANDLER( tms5110_ctl_w )
 {
 	struct tms5110_info *info = sndti_token(SOUND_TMS5110, 0);
 
@@ -189,11 +189,11 @@ WRITE8_HANDLER( tms5110_CTL_w )
 
 /******************************************************************************
 
-     tms5110_PDC_w -- write to PDC pin on the sound chip
+     tms5110_pdc_w -- write to PDC pin on the sound chip
 
 ******************************************************************************/
 
-WRITE8_HANDLER( tms5110_PDC_w )
+WRITE8_HANDLER( tms5110_pdc_w )
 {
 	struct tms5110_info *info = sndti_token(SOUND_TMS5110, 0);
 
diff --git a/src/emu/sound/5110intf.h b/src/emu/sound/5110intf.h
index 0d1ab446e12..a92ff347c5a 100644
--- a/src/emu/sound/5110intf.h
+++ b/src/emu/sound/5110intf.h
@@ -1,5 +1,7 @@
-#ifndef intf5110_h
-#define intf5110_h
+#pragma once
+
+#ifndef __5110INTF_H__
+#define __5110INTF_H__
 
 /* clock rate = 80 * output sample rate,     */
 /* usually 640000 for 8000 Hz sample rate or */
@@ -12,13 +14,12 @@ struct _tms5110_interface
 	void (*load_address)(int addr);	/* speech ROM load address callback */
 };
 
-WRITE8_HANDLER( tms5110_CTL_w );
-WRITE8_HANDLER( tms5110_PDC_w );
+WRITE8_HANDLER( tms5110_ctl_w );
+WRITE8_HANDLER( tms5110_pdc_w );
 
 READ8_HANDLER( tms5110_status_r );
 int tms5110_ready_r(void);
 
 void tms5110_set_frequency(int frequency);
 
-#endif
-
+#endif /* __5110INTF_H__ */
diff --git a/src/emu/sound/5220intf.h b/src/emu/sound/5220intf.h
index 1e7eb8a33d4..f2c1d6fed01 100644
--- a/src/emu/sound/5220intf.h
+++ b/src/emu/sound/5220intf.h
@@ -1,5 +1,7 @@
-#ifndef intf5220_h
-#define intf5220_h
+#pragma once
+
+#ifndef __5200INTF_H__
+#define __5200INTF_H__
 
 /* clock rate = 80 * output sample rate,     */
 /* usually 640000 for 8000 Hz sample rate or */
@@ -28,5 +30,4 @@ enum
 	SNDINFO_INT_TMS5220_VARIANT = SNDINFO_INT_CORE_SPECIFIC
 };
 
-#endif
-
+#endif /* __5200INTF_H__ */
diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c
index 4e6b3c06916..16fb7a453ec 100644
--- a/src/emu/sound/aica.c
+++ b/src/emu/sound/aica.c
@@ -737,7 +737,7 @@ static void AICA_UpdateReg(struct _AICA *AICA, int reg)
 			break;
 		case 0x8:
 		case 0x9:
-			AICA_MidiIn(Machine, 0, AICA->udata.data[0x8/2]&0xff, 0);
+			aica_midi_in(Machine, 0, AICA->udata.data[0x8/2]&0xff, 0);
 			break;
 		case 0x12:
 		case 0x13:
@@ -941,7 +941,7 @@ static void AICA_w16(struct _AICA *AICA,unsigned int addr,unsigned short val)
 
 			if (addr == 0x3bfe)
 			{
-				AICADSP_Start(&AICA->DSP);
+				aica_dsp_start(&AICA->DSP);
 			}
 		}
 	}
@@ -1225,7 +1225,7 @@ static void AICA_DoMasterSamples(struct _AICA *AICA, int nsamples)
 				sample=AICA_UpdateSlot(AICA, slot);
 
 				Enc=((TL(slot))<<0x0)|((IMXL(slot))<<0xd);
-				AICADSP_SetSample(&AICA->DSP,(sample*AICA->LPANTABLE[Enc])>>(SHIFT-2),ISEL(slot),IMXL(slot));
+				aica_dsp_setsample(&AICA->DSP,(sample*AICA->LPANTABLE[Enc])>>(SHIFT-2),ISEL(slot),IMXL(slot));
 				Enc=((TL(slot))<<0x0)|((DIPAN(slot))<<0x8)|((DISDL(slot))<<0xd);
 				{
 					smpl+=(sample*AICA->LPANTABLE[Enc])>>SHIFT;
@@ -1237,7 +1237,7 @@ static void AICA_DoMasterSamples(struct _AICA *AICA, int nsamples)
 		}
 
 		// process the DSP
-		AICADSP_Step(&AICA->DSP);
+		aica_dsp_step(&AICA->DSP);
 
 		// mix DSP output
 		for(i=0;i<16;++i)
@@ -1302,7 +1302,7 @@ static void aica_stop(void)
 }
 #endif
 
-void AICA_set_ram_base(int which, void *base, int size)
+void aica_set_ram_base(int which, void *base, int size)
 {
 	struct _AICA *AICA = sndti_token(SOUND_AICA, which);
 	if (AICA)
@@ -1316,7 +1316,7 @@ void AICA_set_ram_base(int which, void *base, int size)
 	}
 }
 
-READ16_HANDLER( AICA_0_r )
+READ16_HANDLER( aica_0_r )
 {
 	struct _AICA *AICA = sndti_token(SOUND_AICA, 0);
 	UINT16 res = AICA_r16(AICA, offset*2);
@@ -1324,7 +1324,7 @@ READ16_HANDLER( AICA_0_r )
 	return res;
 }
 
-WRITE16_HANDLER( AICA_0_w )
+WRITE16_HANDLER( aica_0_w )
 {
 	struct _AICA *AICA = sndti_token(SOUND_AICA, 0);
 	UINT16 tmp;
@@ -1334,14 +1334,14 @@ WRITE16_HANDLER( AICA_0_w )
 	AICA_w16(AICA,offset*2, tmp);
 }
 
-WRITE16_HANDLER( AICA_MidiIn )
+WRITE16_HANDLER( aica_midi_in )
 {
 	struct _AICA *AICA = sndti_token(SOUND_AICA, 0);
 	AICA->MidiStack[AICA->MidiW++]=data;
 	AICA->MidiW &= 15;
 }
 
-READ16_HANDLER( AICA_MidiOutR )
+READ16_HANDLER( aica_midi_out_r )
 {
 	struct _AICA *AICA = sndti_token(SOUND_AICA, 0);
 	unsigned char val;
diff --git a/src/emu/sound/aica.h b/src/emu/sound/aica.h
index f7af3567ce4..b52336719b2 100644
--- a/src/emu/sound/aica.h
+++ b/src/emu/sound/aica.h
@@ -3,8 +3,8 @@
     Sega/Yamaha AICA emulation
 */
 
-#ifndef _AICA_H_
-#define _AICA_H_
+#ifndef __AICA_H__
+#define __AICA_H__
 
 #define MAX_AICA	(2)
 
@@ -15,14 +15,14 @@ struct _aica_interface
 	void (*irq_callback)(running_machine *machine, int state);	/* irq callback */
 };
 
-void AICA_set_ram_base(int which, void *base, int size);
+void aica_set_ram_base(int which, void *base, int size);
 
 // AICA register access
-READ16_HANDLER( AICA_0_r );
-WRITE16_HANDLER( AICA_0_w );
+READ16_HANDLER( aica_0_r );
+WRITE16_HANDLER( aica_0_w );
 
 // MIDI I/O access
-WRITE16_HANDLER( AICA_MidiIn );
-READ16_HANDLER( AICA_MidiOutR );
+WRITE16_HANDLER( aica_midi_in );
+READ16_HANDLER( aica_midi_out_r );
 
-#endif
+#endif /* __AICA_H__ */
diff --git a/src/emu/sound/aicadsp.c b/src/emu/sound/aicadsp.c
index 65d6e3358cb..475179cb401 100644
--- a/src/emu/sound/aicadsp.c
+++ b/src/emu/sound/aicadsp.c
@@ -55,14 +55,14 @@ static INT32 UNPACK(UINT16 val)
 	return uval;
 }
 
-void AICADSP_Init(struct _AICADSP *DSP)
+void aica_dsp_init(struct _AICADSP *DSP)
 {
 	memset(DSP,0,sizeof(struct _AICADSP));
 	DSP->RBL=0x8000;
 	DSP->Stopped=1;
 }
 
-void AICADSP_Step(struct _AICADSP *DSP)
+void aica_dsp_step(struct _AICADSP *DSP)
 {
 	INT32 ACC=0;	//26 bit
 	INT32 SHIFTED=0;	//24 bit
@@ -328,7 +328,7 @@ void AICADSP_Step(struct _AICADSP *DSP)
 //      fclose(f);
 }
 
-void AICADSP_SetSample(struct _AICADSP *DSP,INT32 sample,int SEL,int MXL)
+void aica_dsp_setsample(struct _AICADSP *DSP,INT32 sample,int SEL,int MXL)
 {
 	//DSP->MIXS[SEL]+=sample<<(MXL+1)/*7*/;
 	DSP->MIXS[SEL]+=sample;
@@ -336,7 +336,7 @@ void AICADSP_SetSample(struct _AICADSP *DSP,INT32 sample,int SEL,int MXL)
 //      int a=1;
 }
 
-void AICADSP_Start(struct _AICADSP *DSP)
+void aica_dsp_start(struct _AICADSP *DSP)
 {
 	int i;
 	DSP->Stopped=0;
diff --git a/src/emu/sound/aicadsp.h b/src/emu/sound/aicadsp.h
index b10accff59c..9f256d68773 100644
--- a/src/emu/sound/aicadsp.h
+++ b/src/emu/sound/aicadsp.h
@@ -1,5 +1,7 @@
-#ifndef AICADSP_H
-#define AICADSP_H
+#pragma once
+
+#ifndef __AICADSP_H__
+#define __AICADSP_H__
 
 //the DSP Context
 struct _AICADSP
@@ -30,8 +32,9 @@ struct _AICADSP
 	int LastStep;
 };
 
-void AICADSP_Init(struct _AICADSP *DSP);
-void AICADSP_SetSample(struct _AICADSP *DSP, INT32 sample, INT32 SEL, INT32 MXL);
-void AICADSP_Step(struct _AICADSP *DSP);
-void AICADSP_Start(struct _AICADSP *DSP);
-#endif
+void aica_dsp_init(struct _AICADSP *DSP);
+void aica_dsp_setsample(struct _AICADSP *DSP, INT32 sample, INT32 SEL, INT32 MXL);
+void aica_dsp_step(struct _AICADSP *DSP);
+void aica_dsp_start(struct _AICADSP *DSP);
+
+#endif /* __AICADSP_H__ */
diff --git a/src/emu/sound/astrocde.h b/src/emu/sound/astrocde.h
index cfefc75f9d6..0b24e2d49f1 100644
--- a/src/emu/sound/astrocde.h
+++ b/src/emu/sound/astrocde.h
@@ -1,8 +1,9 @@
+#pragma once
 
-#ifndef ASTROCADE_H
-#define ASTROCADE_H
+#ifndef __ASTROCDE_H__
+#define __ASTROCDE_H__
 
 WRITE8_HANDLER( astrocade_sound1_w );
 WRITE8_HANDLER( astrocade_sound2_w );
 
-#endif
+#endif /* __ASTROCDE_H__ */
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 8b2e245af59..289def77ed1 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -951,50 +951,50 @@ void ymz294_get_info(void *token, UINT32 state, sndinfo *info)
  *
  *************************************/
 
-READ8_HANDLER( AY8910_read_port_0_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)); }
-READ8_HANDLER( AY8910_read_port_1_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 1)); }
-READ8_HANDLER( AY8910_read_port_2_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 2)); }
-READ8_HANDLER( AY8910_read_port_3_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 3)); }
-READ8_HANDLER( AY8910_read_port_4_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 4)); }
-READ16_HANDLER( AY8910_read_port_0_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)); }
-READ16_HANDLER( AY8910_read_port_1_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 1)); }
-READ16_HANDLER( AY8910_read_port_2_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 2)); }
-READ16_HANDLER( AY8910_read_port_3_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 3)); }
-READ16_HANDLER( AY8910_read_port_4_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 4)); }
-READ16_HANDLER( AY8910_read_port_0_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)) << 8; }
-READ16_HANDLER( AY8910_read_port_1_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 1)) << 8; }
-READ16_HANDLER( AY8910_read_port_2_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 2)) << 8; }
-READ16_HANDLER( AY8910_read_port_3_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 3)) << 8; }
-READ16_HANDLER( AY8910_read_port_4_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 4)) << 8; }
+READ8_HANDLER( ay8910_read_port_0_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)); }
+READ8_HANDLER( ay8910_read_port_1_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 1)); }
+READ8_HANDLER( ay8910_read_port_2_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 2)); }
+READ8_HANDLER( ay8910_read_port_3_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 3)); }
+READ8_HANDLER( ay8910_read_port_4_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 4)); }
+READ16_HANDLER( ay8910_read_port_0_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)); }
+READ16_HANDLER( ay8910_read_port_1_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 1)); }
+READ16_HANDLER( ay8910_read_port_2_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 2)); }
+READ16_HANDLER( ay8910_read_port_3_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 3)); }
+READ16_HANDLER( ay8910_read_port_4_lsb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 4)); }
+READ16_HANDLER( ay8910_read_port_0_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 0)) << 8; }
+READ16_HANDLER( ay8910_read_port_1_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 1)) << 8; }
+READ16_HANDLER( ay8910_read_port_2_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 2)) << 8; }
+READ16_HANDLER( ay8910_read_port_3_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 3)) << 8; }
+READ16_HANDLER( ay8910_read_port_4_msb_r ) { return ay8910_read_ym(sndti_token(SOUND_AY8910, 4)) << 8; }
 
-WRITE8_HANDLER( AY8910_control_port_0_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data); }
-WRITE8_HANDLER( AY8910_control_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data); }
-WRITE8_HANDLER( AY8910_control_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data); }
-WRITE8_HANDLER( AY8910_control_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data); }
-WRITE8_HANDLER( AY8910_control_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data); }
-WRITE16_HANDLER( AY8910_control_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_4_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data & 0xff); }
-WRITE16_HANDLER( AY8910_control_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_1_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_2_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_3_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data >> 8); }
-WRITE16_HANDLER( AY8910_control_port_4_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data >> 8); }
+WRITE8_HANDLER( ay8910_control_port_0_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data); }
+WRITE8_HANDLER( ay8910_control_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data); }
+WRITE8_HANDLER( ay8910_control_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data); }
+WRITE8_HANDLER( ay8910_control_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data); }
+WRITE8_HANDLER( ay8910_control_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data); }
+WRITE16_HANDLER( ay8910_control_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data & 0xff); }
+WRITE16_HANDLER( ay8910_control_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data & 0xff); }
+WRITE16_HANDLER( ay8910_control_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data & 0xff); }
+WRITE16_HANDLER( ay8910_control_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data & 0xff); }
+WRITE16_HANDLER( ay8910_control_port_4_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data & 0xff); }
+WRITE16_HANDLER( ay8910_control_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),0,data >> 8); }
+WRITE16_HANDLER( ay8910_control_port_1_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),0,data >> 8); }
+WRITE16_HANDLER( ay8910_control_port_2_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),0,data >> 8); }
+WRITE16_HANDLER( ay8910_control_port_3_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),0,data >> 8); }
+WRITE16_HANDLER( ay8910_control_port_4_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),0,data >> 8); }
 
-WRITE8_HANDLER( AY8910_write_port_0_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data); }
-WRITE8_HANDLER( AY8910_write_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data); }
-WRITE8_HANDLER( AY8910_write_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data); }
-WRITE8_HANDLER( AY8910_write_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data); }
-WRITE8_HANDLER( AY8910_write_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data); }
-WRITE16_HANDLER( AY8910_write_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_4_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data & 0xff); }
-WRITE16_HANDLER( AY8910_write_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_1_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_2_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_3_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data >> 8); }
-WRITE16_HANDLER( AY8910_write_port_4_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data >> 8); }
+WRITE8_HANDLER( ay8910_write_port_0_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data); }
+WRITE8_HANDLER( ay8910_write_port_1_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data); }
+WRITE8_HANDLER( ay8910_write_port_2_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data); }
+WRITE8_HANDLER( ay8910_write_port_3_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data); }
+WRITE8_HANDLER( ay8910_write_port_4_w ) { ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data); }
+WRITE16_HANDLER( ay8910_write_port_0_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data & 0xff); }
+WRITE16_HANDLER( ay8910_write_port_1_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data & 0xff); }
+WRITE16_HANDLER( ay8910_write_port_2_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data & 0xff); }
+WRITE16_HANDLER( ay8910_write_port_3_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data & 0xff); }
+WRITE16_HANDLER( ay8910_write_port_4_lsb_w ) { if (ACCESSING_BITS_0_7) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data & 0xff); }
+WRITE16_HANDLER( ay8910_write_port_0_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 0),1,data >> 8); }
+WRITE16_HANDLER( ay8910_write_port_1_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 1),1,data >> 8); }
+WRITE16_HANDLER( ay8910_write_port_2_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 2),1,data >> 8); }
+WRITE16_HANDLER( ay8910_write_port_3_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 3),1,data >> 8); }
+WRITE16_HANDLER( ay8910_write_port_4_msb_w ) { if (ACCESSING_BITS_8_15) ay8910_write_ym(sndti_token(SOUND_AY8910, 4),1,data >> 8); }
diff --git a/src/emu/sound/ay8910.h b/src/emu/sound/ay8910.h
index 270c6db1cc1..560807c7d33 100644
--- a/src/emu/sound/ay8910.h
+++ b/src/emu/sound/ay8910.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef __AY8910_H__
 #define __AY8910_H__
 
@@ -74,53 +76,53 @@ struct _ay8910_interface
 void ay8910_set_volume(int chip,int channel,int volume);
 
 
-READ8_HANDLER( AY8910_read_port_0_r );
-READ8_HANDLER( AY8910_read_port_1_r );
-READ8_HANDLER( AY8910_read_port_2_r );
-READ8_HANDLER( AY8910_read_port_3_r );
-READ8_HANDLER( AY8910_read_port_4_r );
-READ16_HANDLER( AY8910_read_port_0_lsb_r );
-READ16_HANDLER( AY8910_read_port_1_lsb_r );
-READ16_HANDLER( AY8910_read_port_2_lsb_r );
-READ16_HANDLER( AY8910_read_port_3_lsb_r );
-READ16_HANDLER( AY8910_read_port_4_lsb_r );
-READ16_HANDLER( AY8910_read_port_0_msb_r );
-READ16_HANDLER( AY8910_read_port_1_msb_r );
-READ16_HANDLER( AY8910_read_port_2_msb_r );
-READ16_HANDLER( AY8910_read_port_3_msb_r );
-READ16_HANDLER( AY8910_read_port_4_msb_r );
+READ8_HANDLER( ay8910_read_port_0_r );
+READ8_HANDLER( ay8910_read_port_1_r );
+READ8_HANDLER( ay8910_read_port_2_r );
+READ8_HANDLER( ay8910_read_port_3_r );
+READ8_HANDLER( ay8910_read_port_4_r );
+READ16_HANDLER( ay8910_read_port_0_lsb_r );
+READ16_HANDLER( ay8910_read_port_1_lsb_r );
+READ16_HANDLER( ay8910_read_port_2_lsb_r );
+READ16_HANDLER( ay8910_read_port_3_lsb_r );
+READ16_HANDLER( ay8910_read_port_4_lsb_r );
+READ16_HANDLER( ay8910_read_port_0_msb_r );
+READ16_HANDLER( ay8910_read_port_1_msb_r );
+READ16_HANDLER( ay8910_read_port_2_msb_r );
+READ16_HANDLER( ay8910_read_port_3_msb_r );
+READ16_HANDLER( ay8910_read_port_4_msb_r );
 
-WRITE8_HANDLER( AY8910_control_port_0_w );
-WRITE8_HANDLER( AY8910_control_port_1_w );
-WRITE8_HANDLER( AY8910_control_port_2_w );
-WRITE8_HANDLER( AY8910_control_port_3_w );
-WRITE8_HANDLER( AY8910_control_port_4_w );
-WRITE16_HANDLER( AY8910_control_port_0_lsb_w );
-WRITE16_HANDLER( AY8910_control_port_1_lsb_w );
-WRITE16_HANDLER( AY8910_control_port_2_lsb_w );
-WRITE16_HANDLER( AY8910_control_port_3_lsb_w );
-WRITE16_HANDLER( AY8910_control_port_4_lsb_w );
-WRITE16_HANDLER( AY8910_control_port_0_msb_w );
-WRITE16_HANDLER( AY8910_control_port_1_msb_w );
-WRITE16_HANDLER( AY8910_control_port_2_msb_w );
-WRITE16_HANDLER( AY8910_control_port_3_msb_w );
-WRITE16_HANDLER( AY8910_control_port_4_msb_w );
+WRITE8_HANDLER( ay8910_control_port_0_w );
+WRITE8_HANDLER( ay8910_control_port_1_w );
+WRITE8_HANDLER( ay8910_control_port_2_w );
+WRITE8_HANDLER( ay8910_control_port_3_w );
+WRITE8_HANDLER( ay8910_control_port_4_w );
+WRITE16_HANDLER( ay8910_control_port_0_lsb_w );
+WRITE16_HANDLER( ay8910_control_port_1_lsb_w );
+WRITE16_HANDLER( ay8910_control_port_2_lsb_w );
+WRITE16_HANDLER( ay8910_control_port_3_lsb_w );
+WRITE16_HANDLER( ay8910_control_port_4_lsb_w );
+WRITE16_HANDLER( ay8910_control_port_0_msb_w );
+WRITE16_HANDLER( ay8910_control_port_1_msb_w );
+WRITE16_HANDLER( ay8910_control_port_2_msb_w );
+WRITE16_HANDLER( ay8910_control_port_3_msb_w );
+WRITE16_HANDLER( ay8910_control_port_4_msb_w );
 
-WRITE8_HANDLER( AY8910_write_port_0_w );
-WRITE8_HANDLER( AY8910_write_port_1_w );
-WRITE8_HANDLER( AY8910_write_port_2_w );
-WRITE8_HANDLER( AY8910_write_port_3_w );
-WRITE8_HANDLER( AY8910_write_port_4_w );
-WRITE16_HANDLER( AY8910_write_port_0_lsb_w );
-WRITE16_HANDLER( AY8910_write_port_1_lsb_w );
-WRITE16_HANDLER( AY8910_write_port_2_lsb_w );
-WRITE16_HANDLER( AY8910_write_port_3_lsb_w );
-WRITE16_HANDLER( AY8910_write_port_4_lsb_w );
-WRITE16_HANDLER( AY8910_write_port_0_msb_w );
-WRITE16_HANDLER( AY8910_write_port_1_msb_w );
-WRITE16_HANDLER( AY8910_write_port_2_msb_w );
-WRITE16_HANDLER( AY8910_write_port_3_msb_w );
-WRITE16_HANDLER( AY8910_write_port_4_msb_w );
+WRITE8_HANDLER( ay8910_write_port_0_w );
+WRITE8_HANDLER( ay8910_write_port_1_w );
+WRITE8_HANDLER( ay8910_write_port_2_w );
+WRITE8_HANDLER( ay8910_write_port_3_w );
+WRITE8_HANDLER( ay8910_write_port_4_w );
+WRITE16_HANDLER( ay8910_write_port_0_lsb_w );
+WRITE16_HANDLER( ay8910_write_port_1_lsb_w );
+WRITE16_HANDLER( ay8910_write_port_2_lsb_w );
+WRITE16_HANDLER( ay8910_write_port_3_lsb_w );
+WRITE16_HANDLER( ay8910_write_port_4_lsb_w );
+WRITE16_HANDLER( ay8910_write_port_0_msb_w );
+WRITE16_HANDLER( ay8910_write_port_1_msb_w );
+WRITE16_HANDLER( ay8910_write_port_2_msb_w );
+WRITE16_HANDLER( ay8910_write_port_3_msb_w );
+WRITE16_HANDLER( ay8910_write_port_4_msb_w );
 
 /*********** An interface for SSG of YM2203 ***********/
 
diff --git a/src/emu/sound/beep.h b/src/emu/sound/beep.h
index 5b6453483ad..8be61fd742f 100644
--- a/src/emu/sound/beep.h
+++ b/src/emu/sound/beep.h
@@ -1,5 +1,7 @@
-#ifndef BEEP_H
-#define BEEP_H
+#pragma once
+
+#ifndef __BEEP_H__
+#define __BEEP_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -13,4 +15,4 @@ void beep_set_volume(int,int);
 }
 #endif
 
-#endif
+#endif /* __BEEP_H__ */
diff --git a/src/emu/sound/bsmt2000.c b/src/emu/sound/bsmt2000.c
index 1319db3b033..7b6abd83430 100644
--- a/src/emu/sound/bsmt2000.c
+++ b/src/emu/sound/bsmt2000.c
@@ -352,10 +352,10 @@ static void bsmt2000_reg_write(bsmt2000_chip *chip, offs_t offset, UINT16 data)
 ***************************************************************************/
 
 /*-------------------------------------------------
-    BSMT2000_data_0_w - write to chip 0
+    bsmt2000_data_0_w - write to chip 0
 -------------------------------------------------*/
 
-WRITE16_HANDLER( BSMT2000_data_0_w )
+WRITE16_HANDLER( bsmt2000_data_0_w )
 {
 	bsmt2000_reg_write(sndti_token(SOUND_BSMT2000, 0), offset, data);
 }
diff --git a/src/emu/sound/bsmt2000.h b/src/emu/sound/bsmt2000.h
index 0dd2027988a..ad7d9b96055 100644
--- a/src/emu/sound/bsmt2000.h
+++ b/src/emu/sound/bsmt2000.h
@@ -5,9 +5,11 @@
  *
  **********************************************************************************************/
 
-#ifndef BSMT2000_H
-#define BSMT2000_H
+#pragma once
 
-WRITE16_HANDLER( BSMT2000_data_0_w );
+#ifndef __BSMT2000_H__
+#define __BSMT2000_H__
 
-#endif
+WRITE16_HANDLER( bsmt2000_data_0_w );
+
+#endif /* __BSMT2000_H__ */
diff --git a/src/emu/sound/c140.c b/src/emu/sound/c140.c
index ec878afb63a..fd03ad19941 100644
--- a/src/emu/sound/c140.c
+++ b/src/emu/sound/c140.c
@@ -120,7 +120,7 @@ static void init_voice( VOICE *v )
 	v->sample_end=0;
 	v->sample_loop=0;
 }
-READ8_HANDLER( C140_r )
+READ8_HANDLER( c140_r )
 {
 	struct c140_info *info = sndti_token(SOUND_C140, 0);
 	offset&=0x1ff;
@@ -185,7 +185,7 @@ static long find_sample(struct c140_info *info, long adrs, long bank, int voice)
 
 	return (newadr);
 }
-WRITE8_HANDLER( C140_w )
+WRITE8_HANDLER( c140_w )
 {
 	struct c140_info *info = sndti_token(SOUND_C140, 0);
 	stream_update(info->stream);
@@ -247,7 +247,7 @@ WRITE8_HANDLER( C140_w )
 	}
 }
 
-void C140_set_base(int which, void *base)
+void c140_set_base(int which, void *base)
 {
 	struct c140_info *info = sndti_token(SOUND_C140, 0);
 	info->pRom = base;
diff --git a/src/emu/sound/c140.h b/src/emu/sound/c140.h
index 4b6cd18ab09..1775fe58178 100644
--- a/src/emu/sound/c140.h
+++ b/src/emu/sound/c140.h
@@ -1,12 +1,14 @@
 /* C140.h */
 
-#ifndef _NAMCO_C140_
-#define _NAMCO_C140_
+#pragma once
 
-READ8_HANDLER( C140_r );
-WRITE8_HANDLER( C140_w );
+#ifndef __C140_H__
+#define __C140_H__
 
-void C140_set_base(int which, void *base);
+READ8_HANDLER( c140_r );
+WRITE8_HANDLER( c140_w );
+
+void c140_set_base(int which, void *base);
 
 enum
 {
@@ -21,4 +23,4 @@ struct _c140_interface {
     int banking_type;
 };
 
-#endif
+#endif /* __C140_H__ */
diff --git a/src/emu/sound/c352.h b/src/emu/sound/c352.h
index e0b3af89ff6..c28a18d4776 100644
--- a/src/emu/sound/c352.h
+++ b/src/emu/sound/c352.h
@@ -1,8 +1,10 @@
-#ifndef _C352_H_
-#define _C352_H_
+#pragma once
+
+#ifndef __C352_H__
+#define __C352_H__
 
 READ16_HANDLER( c352_0_r );
 WRITE16_HANDLER( c352_0_w );
 
-#endif
+#endif /* __C352_H__ */
 
diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c
index 17ab85eb596..afaa837a7c7 100644
--- a/src/emu/sound/c6280.c
+++ b/src/emu/sound/c6280.c
@@ -327,9 +327,9 @@ static void *c6280_start(const char *tag, int sndindex, int clock, const void *c
     return info;
 }
 
-READ8_HANDLER(  C6280_r) { return h6280io_get_buffer();}
-WRITE8_HANDLER( C6280_0_w ) {  h6280io_set_buffer(data); c6280_write(sndti_token(SOUND_C6280, 0),offset,data); }
-WRITE8_HANDLER( C6280_1_w ) {  h6280io_set_buffer(data); c6280_write(sndti_token(SOUND_C6280, 1),offset,data); }
+READ8_HANDLER(  c6280_r) { return h6280io_get_buffer();}
+WRITE8_HANDLER( c6280_0_w ) {  h6280io_set_buffer(data); c6280_write(sndti_token(SOUND_C6280, 0),offset,data); }
+WRITE8_HANDLER( c6280_1_w ) {  h6280io_set_buffer(data); c6280_write(sndti_token(SOUND_C6280, 1),offset,data); }
 
 
 
diff --git a/src/emu/sound/c6280.h b/src/emu/sound/c6280.h
index 00e020ab2e2..7012569ce21 100644
--- a/src/emu/sound/c6280.h
+++ b/src/emu/sound/c6280.h
@@ -1,8 +1,11 @@
-#ifndef _C6280_H_
-#define _C6280_H_
+#pragma once
+
+#ifndef __C6280_H__
+#define __C6280_H__
 
 /* Function prototypes */
-WRITE8_HANDLER( C6280_0_w );
-WRITE8_HANDLER( C6280_1_w );
-READ8_HANDLER( C6280_r );
-#endif /* _C6280_H_ */
+WRITE8_HANDLER( c6280_0_w );
+WRITE8_HANDLER( c6280_1_w );
+READ8_HANDLER( c6280_r );
+
+#endif /* __C6280_H__ */
diff --git a/src/emu/sound/cdda.h b/src/emu/sound/cdda.h
index 68069a0757b..d0b0c618fab 100644
--- a/src/emu/sound/cdda.h
+++ b/src/emu/sound/cdda.h
@@ -1,4 +1,6 @@
-#ifndef _CDDA_H_
+#pragma once
+
+#ifndef __CDDA_H__
 #define _CDDA_H_
 
 void cdda_set_cdrom(int num, void *file);
@@ -13,5 +15,4 @@ int cdda_audio_active(int num);
 int cdda_audio_paused(int num);
 int cdda_audio_ended(int num);
 
-#endif
-
+#endif /* __CDDA_H__ */
diff --git a/src/emu/sound/cdp1869.h b/src/emu/sound/cdp1869.h
index c9d2044ecd9..2bef9de2eac 100644
--- a/src/emu/sound/cdp1869.h
+++ b/src/emu/sound/cdp1869.h
@@ -27,8 +27,10 @@
 
 */
 
-#ifndef __CDP1869_SOUND__
-#define __CDP1869_SOUND__
+#pragma once
+
+#ifndef __CDP1869_H__
+#define __CDP1869_H__
 
 void cdp1869_set_toneamp(int which, int value);
 void cdp1869_set_tonefreq(int which, int value);
@@ -38,4 +40,4 @@ void cdp1869_set_wnamp(int which, int value);
 void cdp1869_set_wnfreq(int which, int value);
 void cdp1869_set_wnoff(int which, int value);
 
-#endif
+#endif /* __CDP1869_H__ */
diff --git a/src/emu/sound/cem3394.h b/src/emu/sound/cem3394.h
index 3a16e2dc9bc..ad0429a28a5 100644
--- a/src/emu/sound/cem3394.h
+++ b/src/emu/sound/cem3394.h
@@ -1,5 +1,7 @@
-#ifndef cem3394_h
-#define cem3394_h
+#pragma once
+
+#ifndef __CEM3394_H__
+#define __CEM3394_H__
 
 
 #define CEM3394_SAMPLE_RATE		(44100*4)
@@ -42,5 +44,4 @@ void cem3394_set_voltage(int chip, int input, double voltage);
 double cem3394_get_parameter(int chip, int input);
 
 
-#endif
-
+#endif /* __CEM3394_H__ */
diff --git a/src/emu/sound/custom.h b/src/emu/sound/custom.h
index 303a7be6118..9e2e52722bf 100644
--- a/src/emu/sound/custom.h
+++ b/src/emu/sound/custom.h
@@ -1,5 +1,7 @@
-#ifndef CUSTOM_H
-#define CUSTOM_H
+#pragma once
+
+#ifndef __CUSTOM_H__
+#define __CUSTOM_H__
 
 typedef struct _custom_sound_interface custom_sound_interface;
 struct _custom_sound_interface
@@ -13,4 +15,4 @@ struct _custom_sound_interface
 void *custom_get_token(int index);
 
 
-#endif
+#endif /* __CUSTOM_H__ */
diff --git a/src/emu/sound/dac.c b/src/emu/sound/dac.c
index cb32e02db41..411157ab54d 100644
--- a/src/emu/sound/dac.c
+++ b/src/emu/sound/dac.c
@@ -28,7 +28,7 @@ static void DAC_update(void *param,stream_sample_t **inputs, stream_sample_t **_
 }
 
 
-void DAC_data_w(int num,UINT8 data)
+void dac_data_w(int num,UINT8 data)
 {
 	struct dac_info *info = sndti_token(SOUND_DAC, num);
 	INT16 out = info->UnsignedVolTable[data];
@@ -42,7 +42,7 @@ void DAC_data_w(int num,UINT8 data)
 }
 
 
-void DAC_signed_data_w(int num,UINT8 data)
+void dac_signed_data_w(int num,UINT8 data)
 {
 	struct dac_info *info = sndti_token(SOUND_DAC, num);
 	INT16 out = info->SignedVolTable[data];
@@ -56,7 +56,7 @@ void DAC_signed_data_w(int num,UINT8 data)
 }
 
 
-void DAC_data_16_w(int num,UINT16 data)
+void dac_data_16_w(int num,UINT16 data)
 {
 	struct dac_info *info = sndti_token(SOUND_DAC, num);
 	INT16 out = data >> 1;		/* range      0..32767 */
@@ -70,7 +70,7 @@ void DAC_data_16_w(int num,UINT16 data)
 }
 
 
-void DAC_signed_data_16_w(int num,UINT16 data)
+void dac_signed_data_16_w(int num,UINT16 data)
 {
 	struct dac_info *info = sndti_token(SOUND_DAC, num);
 	INT16 out = (INT32)data - (INT32)0x08000;	/* range -32768..32767 */
@@ -118,34 +118,34 @@ static void *dac_start(const char *tag, int sndindex, int clock, const void *con
 
 
 
-WRITE8_HANDLER( DAC_0_data_w )
+WRITE8_HANDLER( dac_0_data_w )
 {
-	DAC_data_w(0,data);
+	dac_data_w(0,data);
 }
 
-WRITE8_HANDLER( DAC_1_data_w )
+WRITE8_HANDLER( dac_1_data_w )
 {
-	DAC_data_w(1,data);
+	dac_data_w(1,data);
 }
 
-WRITE8_HANDLER( DAC_2_data_w )
+WRITE8_HANDLER( dac_2_data_w )
 {
-	DAC_data_w(2,data);
+	dac_data_w(2,data);
 }
 
-WRITE8_HANDLER( DAC_0_signed_data_w )
+WRITE8_HANDLER( dac_0_signed_data_w )
 {
-	DAC_signed_data_w(0,data);
+	dac_signed_data_w(0,data);
 }
 
-WRITE8_HANDLER( DAC_1_signed_data_w )
+WRITE8_HANDLER( dac_1_signed_data_w )
 {
-	DAC_signed_data_w(1,data);
+	dac_signed_data_w(1,data);
 }
 
-WRITE8_HANDLER( DAC_2_signed_data_w )
+WRITE8_HANDLER( dac_2_signed_data_w )
 {
-	DAC_signed_data_w(2,data);
+	dac_signed_data_w(2,data);
 }
 
 
diff --git a/src/emu/sound/dac.h b/src/emu/sound/dac.h
index 3a83baf3394..3abf909beb5 100644
--- a/src/emu/sound/dac.h
+++ b/src/emu/sound/dac.h
@@ -1,16 +1,18 @@
-#ifndef DAC_H
-#define DAC_H
+#pragma once
 
-void DAC_data_w(int num,UINT8 data);
-void DAC_signed_data_w(int num,UINT8 data);
-void DAC_data_16_w(int num,UINT16 data);
-void DAC_signed_data_16_w(int num,UINT16 data);
+#ifndef __DAC_H__
+#define __DAC_H__
 
-WRITE8_HANDLER( DAC_0_data_w );
-WRITE8_HANDLER( DAC_1_data_w );
-WRITE8_HANDLER( DAC_2_data_w );
-WRITE8_HANDLER( DAC_0_signed_data_w );
-WRITE8_HANDLER( DAC_1_signed_data_w );
-WRITE8_HANDLER( DAC_2_signed_data_w );
+void dac_data_w(int num,UINT8 data);
+void dac_signed_data_w(int num,UINT8 data);
+void dac_data_16_w(int num,UINT16 data);
+void dac_signed_data_16_w(int num,UINT16 data);
 
-#endif
+WRITE8_HANDLER( dac_0_data_w );
+WRITE8_HANDLER( dac_1_data_w );
+WRITE8_HANDLER( dac_2_data_w );
+WRITE8_HANDLER( dac_0_signed_data_w );
+WRITE8_HANDLER( dac_1_signed_data_w );
+WRITE8_HANDLER( dac_2_signed_data_w );
+
+#endif /* __DAC_H__ */
diff --git a/src/emu/sound/discrete.h b/src/emu/sound/discrete.h
index 625b3cab51d..63796c0171f 100644
--- a/src/emu/sound/discrete.h
+++ b/src/emu/sound/discrete.h
@@ -1,5 +1,7 @@
-#ifndef _discrete_h_
-#define _discrete_h_
+#pragma once
+
+#ifndef __DISCRETE_H__
+#define __DISCRETE_H__
 
 #include "rescap.h"
 
@@ -3397,6 +3399,7 @@ typedef struct _discrete_sound_block discrete_sound_block;
 
 typedef struct _node_description node_description;
 
+typedef struct _discrete_module discrete_module;
 struct _discrete_module
 {
 	int				type;
@@ -3406,7 +3409,6 @@ struct _discrete_module
 	void (*reset)(node_description *node);	/* Called to reset a node after creation or system reset */
 	void (*step)(node_description *node);	/* Called to execute one time delta of output update */
 };
-typedef struct _discrete_module discrete_module;
 
 
 /*************************************
@@ -3442,6 +3444,7 @@ struct _node_description
  *
  *************************************/
 
+typedef struct _discrete_lfsr_desc discrete_lfsr_desc;
 struct _discrete_lfsr_desc
 {
 	int clock_type;
@@ -3461,9 +3464,9 @@ struct _discrete_lfsr_desc
 
 	int output_bit;
 };
-typedef struct _discrete_lfsr_desc discrete_lfsr_desc;
 
 
+typedef struct _discrete_op_amp_osc_info discrete_op_amp_osc_info;
 struct _discrete_op_amp_osc_info
 {
 	int		type;
@@ -3478,13 +3481,13 @@ struct _discrete_op_amp_osc_info
 	double	c;
 	double	vP;		// Op amp B+
 };
-typedef struct _discrete_op_amp_osc_info discrete_op_amp_osc_info;
 
 
 #define DEFAULT_7414_VALUES 	1.7, 0.9, 3.4
 
 #define DEFAULT_74LS14_VALUES 	1.6, 0.8, 3.4
 
+typedef struct _discrete_schmitt_osc_desc discrete_schmitt_osc_desc;
 struct _discrete_schmitt_osc_desc
 {
 	double	rIn;
@@ -3495,9 +3498,9 @@ struct _discrete_schmitt_osc_desc
 	double	vGate;		// the output high voltage of the gate that gets fedback through rFeedback
 	int		options;	// bitmaped options
 };
-typedef struct _discrete_schmitt_osc_desc discrete_schmitt_osc_desc;
 
 
+typedef struct _discrete_comp_adder_table discrete_comp_adder_table;
 struct _discrete_comp_adder_table
 {
 	int		type;
@@ -3505,9 +3508,9 @@ struct _discrete_comp_adder_table
 	int		length;
 	double	c[DISC_LADDER_MAXRES];	// Componet table
 };
-typedef struct _discrete_comp_adder_table discrete_comp_adder_table;
 
 
+typedef struct _discrete_dac_r1_ladder discrete_dac_r1_ladder;
 struct _discrete_dac_r1_ladder
 {
 	int		ladderLength;		// 2 to DISC_LADDER_MAXRES.  1 would be useless.
@@ -3517,9 +3520,9 @@ struct _discrete_dac_r1_ladder
 	double	rGnd;			// Resistor tied to ground (0 = not used)
 	double	cFilter;		// Filtering cap (0 = not used)
 };
-typedef struct _discrete_dac_r1_ladder discrete_dac_r1_ladder;
 
 
+typedef struct _discrete_integrate_info discrete_integrate_info;
 struct _discrete_integrate_info
 {
 	int		type;
@@ -3533,10 +3536,10 @@ struct _discrete_integrate_info
 	double	f1;
 	double	f2;
 };
-typedef struct _discrete_integrate_info discrete_integrate_info;
 
 
 #define DISC_MAX_MIXER_INPUTS	8
+typedef struct _discrete_mixer_desc discrete_mixer_desc;
 struct _discrete_mixer_desc
 {
 	int		type;
@@ -3550,9 +3553,9 @@ struct _discrete_mixer_desc
 	double	vRef;
 	double	gain;				// Scale value to get output close to +/- 32767
 };
-typedef struct _discrete_mixer_desc discrete_mixer_desc;
 
 
+typedef struct _discrete_op_amp_info discrete_op_amp_info;
 struct _discrete_op_amp_info
 {
 	int		type;
@@ -3564,9 +3567,9 @@ struct _discrete_op_amp_info
 	double	vN;		// Op amp B-
 	double	vP;		// Op amp B+
 };
-typedef struct _discrete_op_amp_info discrete_op_amp_info;
 
 
+typedef struct _discrete_op_amp_1sht_info discrete_op_amp_1sht_info;
 struct _discrete_op_amp_1sht_info
 {
 	int		type;
@@ -3580,9 +3583,9 @@ struct _discrete_op_amp_1sht_info
 	double	vN;		// Op amp B-
 	double	vP;		// Op amp B+
 };
-typedef struct _discrete_op_amp_1sht_info discrete_op_amp_1sht_info;
 
 
+typedef struct _discrete_op_amp_tvca_info discrete_op_amp_tvca_info;
 struct _discrete_op_amp_tvca_info
 {
 	double	r1;
@@ -3610,9 +3613,9 @@ struct _discrete_op_amp_tvca_info
 	int		f4;
 	int		f5;
 };
-typedef struct _discrete_op_amp_tvca_info discrete_op_amp_tvca_info;
 
 
+typedef struct _discrete_op_amp_filt_info discrete_op_amp_filt_info;
 struct _discrete_op_amp_filt_info
 {
 	double	r1;
@@ -3627,7 +3630,6 @@ struct _discrete_op_amp_filt_info
 	double	vP;
 	double	vN;
 };
-typedef struct _discrete_op_amp_filt_info discrete_op_amp_filt_info;
 
 
 #define DEFAULT_555_HIGH		-1
@@ -3635,6 +3637,7 @@ typedef struct _discrete_op_amp_filt_info discrete_op_amp_filt_info;
 #define DEFAULT_555_TRIGGER		-1
 #define DEFAULT_555_VALUES		DEFAULT_555_HIGH, DEFAULT_555_THRESHOLD, DEFAULT_555_TRIGGER
 
+typedef struct _discrete_555_desc discrete_555_desc;
 struct _discrete_555_desc
 {
 	int		options;		// bit mapped options
@@ -3643,9 +3646,9 @@ struct _discrete_555_desc
 	double	threshold555;	// normally 2/3 of v555
 	double	trigger555;		// normally 1/3 of v555
 };
-typedef struct _discrete_555_desc discrete_555_desc;
 
 
+typedef struct _discrete_555_cc_desc discrete_555_cc_desc;
 struct _discrete_555_cc_desc
 {
 	int		options;		// bit mapped options
@@ -3656,9 +3659,9 @@ struct _discrete_555_cc_desc
 	double	vCCsource;		// B+ voltage of the Constant Current source
 	double	vCCjunction;	// The voltage drop of the Constant Current source transitor (0 if Op Amp)
 };
-typedef struct _discrete_555_cc_desc discrete_555_cc_desc;
 
 
+typedef struct _discrete_555_vco1_desc discrete_555_vco1_desc;
 struct _discrete_555_vco1_desc
 {
 	int    options;				// bit mapped options
@@ -3668,18 +3671,18 @@ struct _discrete_555_vco1_desc
 	double threshold555;		// normally 2/3 of v555
 	double trigger555;			// normally 1/3 of v555
 };
-typedef struct _discrete_555_vco1_desc discrete_555_vco1_desc;
 
 
+typedef struct _discrete_566_desc discrete_566_desc;
 struct _discrete_566_desc
 {
 	int		options;	// bit mapped options
 	double	vPlus;		// B+ voltage of 566
 	double	vNeg;		// B- voltage of 566
 };
-typedef struct _discrete_566_desc discrete_566_desc;
 
 
+typedef struct _discrete_adsr discrete_adsr;
 struct _discrete_adsr
 {
 	double attack_time;  /* All times are in seconds */
@@ -3691,9 +3694,9 @@ struct _discrete_adsr
 	double release_time;
 	double release_value;
 };
-typedef struct _discrete_adsr discrete_adsr;
 
 
+typedef struct _discrete_custom_info discrete_custom_info;
 struct _discrete_custom_info
 {
 	void (*reset)(node_description *node);	/* Called to reset a node after creation or system reset */
@@ -3701,7 +3704,6 @@ struct _discrete_custom_info
 	size_t contextsize;
 	const void *custom;						/* Custom function specific initialisation data */
 };
-typedef struct _discrete_custom_info discrete_custom_info;
 
 
 // Taken from the transfer characteristerics diagram in CD4049UB datasheet (TI)
@@ -3718,6 +3720,7 @@ typedef struct _discrete_custom_info discrete_custom_info;
 
 #define DISC_OSC_INVERTER_OUT_IS_LOGIC		0x10
 
+typedef struct _discrete_inverter_osc_desc discrete_inverter_osc_desc;
 struct _discrete_inverter_osc_desc
 {
 	double	vB;
@@ -3728,7 +3731,6 @@ struct _discrete_inverter_osc_desc
 	double	clamp; 		// voltage is clamped to -clamp ... vb+clamp if clamp>= 0;
 	int		options;	// bitmaped options
 };
-typedef struct _discrete_inverter_osc_desc discrete_inverter_osc_desc;
 
 
 /*************************************
@@ -4101,4 +4103,4 @@ node_description *discrete_find_node(void *chip, int node);
 WRITE8_HANDLER(discrete_sound_w);
 READ8_HANDLER(discrete_sound_r);
 
-#endif
+#endif /* __DISCRETE_H__ */
diff --git a/src/emu/sound/dmadac.h b/src/emu/sound/dmadac.h
index 37694d4273b..35268191783 100644
--- a/src/emu/sound/dmadac.h
+++ b/src/emu/sound/dmadac.h
@@ -5,12 +5,14 @@
  *
  **********************************************************************************************/
 
-#ifndef DMADAC_H
-#define DMADAC_H
+#pragma once
+
+#ifndef __DMADAC_H__
+#define __DMADAC_H__
 
 void dmadac_transfer(UINT8 first_channel, UINT8 num_channels, offs_t channel_spacing, offs_t frame_spacing, offs_t total_frames, INT16 *data);
 void dmadac_enable(UINT8 first_channel, UINT8 num_channels, UINT8 enable);
 void dmadac_set_frequency(UINT8 first_channel, UINT8 num_channels, double frequency);
 void dmadac_set_volume(UINT8 first_channel, UINT8 num_channels, UINT16 volume);
 
-#endif
+#endif /* __DMADAC_H__ */
diff --git a/src/emu/sound/es5503.c b/src/emu/sound/es5503.c
index 633ffa8eca2..7ffa6550cd7 100644
--- a/src/emu/sound/es5503.c
+++ b/src/emu/sound/es5503.c
@@ -275,7 +275,7 @@ static void *es5503_start(const char *tag, int sndindex, int clock, const void *
 	return chip;
 }
 
-READ8_HANDLER(ES5503_reg_0_r)
+READ8_HANDLER(es5503_reg_0_r)
 {
 	UINT8 retval;
 	int i;
@@ -386,7 +386,7 @@ READ8_HANDLER(ES5503_reg_0_r)
 	return 0;
 }
 
-WRITE8_HANDLER(ES5503_reg_0_w)
+WRITE8_HANDLER(es5503_reg_0_w)
 {
 	ES5503Chip *chip = sndti_token(SOUND_ES5503, 0);
 
@@ -509,7 +509,7 @@ WRITE8_HANDLER(ES5503_reg_0_w)
 	}
 }
 
-void ES5503_set_base_0(UINT8 *wavemem)
+void es5503_set_base_0(UINT8 *wavemem)
 {
 	ES5503Chip *chip = sndti_token(SOUND_ES5503, 0);
 
diff --git a/src/emu/sound/es5503.h b/src/emu/sound/es5503.h
index 635684a5b9a..f77484992e9 100644
--- a/src/emu/sound/es5503.h
+++ b/src/emu/sound/es5503.h
@@ -1,5 +1,7 @@
-#ifndef _ES5503_H_
-#define _ES5503_H_
+#pragma once
+
+#ifndef __ES5503_H__
+#define __ES5503_H__
 
 typedef struct _es5503_interface es5503_interface;
 struct _es5503_interface
@@ -9,8 +11,8 @@ struct _es5503_interface
 	UINT8 *wave_memory;
 };
 
-READ8_HANDLER(ES5503_reg_0_r);
-WRITE8_HANDLER(ES5503_reg_0_w);
-void ES5503_set_base_0(UINT8 *wavemem);
+READ8_HANDLER(es5503_reg_0_r);
+WRITE8_HANDLER(es5503_reg_0_w);
+void es5503_set_base_0(UINT8 *wavemem);
 
-#endif
+#endif /* __ES5503_H__ */
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index 80d84f83c3e..4ec7c3eb861 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -1424,26 +1424,26 @@ static UINT8 es5506_reg_read(struct ES5506Chip *chip, offs_t offset)
 
 /**********************************************************************************************
 
-     ES5506_data_0_r/ES5506_data_1_r -- handle a read from the status register
+     es5506_data_0_r/es5506_data_1_r -- handle a read from the status register
 
 **********************************************************************************************/
 
-READ8_HANDLER( ES5506_data_0_r )
+READ8_HANDLER( es5506_data_0_r )
 {
 	return es5506_reg_read(sndti_token(SOUND_ES5506, 0), offset);
 }
 
-READ8_HANDLER( ES5506_data_1_r )
+READ8_HANDLER( es5506_data_1_r )
 {
 	return es5506_reg_read(sndti_token(SOUND_ES5506, 1), offset);
 }
 
-READ16_HANDLER( ES5506_data_0_word_r )
+READ16_HANDLER( es5506_data_0_word_r )
 {
 	return es5506_reg_read(sndti_token(SOUND_ES5506, 0), offset);
 }
 
-READ16_HANDLER( ES5506_data_1_word_r )
+READ16_HANDLER( es5506_data_1_word_r )
 {
 	return es5506_reg_read(sndti_token(SOUND_ES5506, 1), offset);
 }
@@ -1452,27 +1452,27 @@ READ16_HANDLER( ES5506_data_1_word_r )
 
 /**********************************************************************************************
 
-     ES5506_data_0_w/ES5506_data_1_w -- handle a write to the current register
+     es5506_data_0_w/es5506_data_1_w -- handle a write to the current register
 
 ***********************************************************************************************/
 
-WRITE8_HANDLER( ES5506_data_0_w )
+WRITE8_HANDLER( es5506_data_0_w )
 {
 	es5506_reg_write(sndti_token(SOUND_ES5506, 0), offset, data);
 }
 
-WRITE8_HANDLER( ES5506_data_1_w )
+WRITE8_HANDLER( es5506_data_1_w )
 {
 	es5506_reg_write(sndti_token(SOUND_ES5506, 1), offset, data);
 }
 
-WRITE16_HANDLER( ES5506_data_0_word_w )
+WRITE16_HANDLER( es5506_data_0_word_w )
 {
 	if (ACCESSING_BITS_0_7)
 		es5506_reg_write(sndti_token(SOUND_ES5506, 0), offset, data);
 }
 
-WRITE16_HANDLER( ES5506_data_1_word_w )
+WRITE16_HANDLER( es5506_data_1_word_w )
 {
 	if (ACCESSING_BITS_0_7)
 		es5506_reg_write(sndti_token(SOUND_ES5506, 1), offset, data);
@@ -1480,13 +1480,13 @@ WRITE16_HANDLER( ES5506_data_1_word_w )
 
 
 
-void ES5506_voice_bank_0_w(int voice, int bank)
+void es5506_voice_bank_0_w(int voice, int bank)
 {
 	struct ES5506Chip *chip = sndti_token(SOUND_ES5506, 0);
 	chip->voice[voice].exbank=bank;
 }
 
-void ES5506_voice_bank_1_w(int voice, int bank)
+void es5506_voice_bank_1_w(int voice, int bank)
 {
 	struct ES5506Chip *chip = sndti_token(SOUND_ES5506, 1);
 	chip->voice[voice].exbank=bank;
@@ -2084,37 +2084,37 @@ static UINT16 es5505_reg_read(struct ES5506Chip *chip, offs_t offset)
 
 /**********************************************************************************************
 
-     ES5505_data_0_r/ES5505_data_1_r -- handle a read from the status register
+     es5505_data_0_r/es5505_data_1_r -- handle a read from the status register
 
 ***********************************************************************************************/
 
-READ16_HANDLER( ES5505_data_0_r )
+READ16_HANDLER( es5505_data_0_r )
 {
 	return es5505_reg_read(sndti_token(SOUND_ES5505, 0), offset);
 }
 
-READ16_HANDLER( ES5505_data_1_r )
+READ16_HANDLER( es5505_data_1_r )
 {
 	return es5505_reg_read(sndti_token(SOUND_ES5505, 1), offset);
 }
 
 /**********************************************************************************************
 
-     ES5505_data_0_w/ES5505_data_1_w -- handle a write to the current register
+     es5505_data_0_w/es5505_data_1_w -- handle a write to the current register
 
 ***********************************************************************************************/
 
-WRITE16_HANDLER( ES5505_data_0_w )
+WRITE16_HANDLER( es5505_data_0_w )
 {
 	es5505_reg_write(sndti_token(SOUND_ES5505, 0), offset, data, mem_mask);
 }
 
-WRITE16_HANDLER( ES5505_data_1_w )
+WRITE16_HANDLER( es5505_data_1_w )
 {
 	es5505_reg_write(sndti_token(SOUND_ES5505, 1), offset, data, mem_mask);
 }
 
-void ES5505_voice_bank_0_w(int voice, int bank)
+void es5505_voice_bank_0_w(int voice, int bank)
 {
 	struct ES5506Chip *chip = sndti_token(SOUND_ES5505, 0);
 #if RAINE_CHECK
@@ -2123,7 +2123,7 @@ void ES5505_voice_bank_0_w(int voice, int bank)
 	chip->voice[voice].exbank=bank;
 }
 
-void ES5505_voice_bank_1_w(int voice, int bank)
+void es5505_voice_bank_1_w(int voice, int bank)
 {
 	struct ES5506Chip *chip = sndti_token(SOUND_ES5505, 1);
 #if RAINE_CHECK
diff --git a/src/emu/sound/es5506.h b/src/emu/sound/es5506.h
index 073e7fd0b96..3422ba32761 100644
--- a/src/emu/sound/es5506.h
+++ b/src/emu/sound/es5506.h
@@ -5,8 +5,10 @@
  *
  **********************************************************************************************/
 
-#ifndef ES5506_H
-#define ES5506_H
+#pragma once
+
+#ifndef __ES5506_H__
+#define __ES5506_H__
 
 typedef struct _es5505_interface es5505_interface;
 struct _es5505_interface
@@ -17,13 +19,13 @@ struct _es5505_interface
 	UINT16 (*read_port)(void);			/* input port read */
 };
 
-READ16_HANDLER( ES5505_data_0_r );
-READ16_HANDLER( ES5505_data_1_r );
-WRITE16_HANDLER( ES5505_data_0_w );
-WRITE16_HANDLER( ES5505_data_1_w );
+READ16_HANDLER( es5505_data_0_r );
+READ16_HANDLER( es5505_data_1_r );
+WRITE16_HANDLER( es5505_data_0_w );
+WRITE16_HANDLER( es5505_data_1_w );
 
-void ES5505_voice_bank_0_w(int voice, int bank);
-void ES5505_voice_bank_1_w(int voice, int bank);
+void es5505_voice_bank_0_w(int voice, int bank);
+void es5505_voice_bank_1_w(int voice, int bank);
 
 
 
@@ -38,17 +40,17 @@ struct _es5506_interface
 	UINT16 (*read_port)(void);			/* input port read */
 };
 
-READ8_HANDLER( ES5506_data_0_r );
-READ8_HANDLER( ES5506_data_1_r );
-WRITE8_HANDLER( ES5506_data_0_w );
-WRITE8_HANDLER( ES5506_data_1_w );
+READ8_HANDLER( es5506_data_0_r );
+READ8_HANDLER( es5506_data_1_r );
+WRITE8_HANDLER( es5506_data_0_w );
+WRITE8_HANDLER( es5506_data_1_w );
 
-READ16_HANDLER( ES5506_data_0_word_r );
-READ16_HANDLER( ES5506_data_1_word_r );
-WRITE16_HANDLER( ES5506_data_0_word_w );
-WRITE16_HANDLER( ES5506_data_1_word_w );
+READ16_HANDLER( es5506_data_0_word_r );
+READ16_HANDLER( es5506_data_1_word_r );
+WRITE16_HANDLER( es5506_data_0_word_w );
+WRITE16_HANDLER( es5506_data_1_word_w );
 
-void ES5506_voice_bank_0_w(int voice, int bank);
-void ES5506_voice_bank_1_w(int voice, int bank);
+void es5506_voice_bank_0_w(int voice, int bank);
+void es5506_voice_bank_1_w(int voice, int bank);
 
-#endif
+#endif /* __ES5506_H__ */
diff --git a/src/emu/sound/es8712.c b/src/emu/sound/es8712.c
index bce8f3dc0bc..4dc004c61a8 100644
--- a/src/emu/sound/es8712.c
+++ b/src/emu/sound/es8712.c
@@ -264,11 +264,11 @@ static void es8712_reset(void *chip_src)
 
 /****************************************************************************
 
-    ES8712_set_bank_base -- set the base of the bank on a given chip
+    es8712_set_bank_base -- set the base of the bank on a given chip
 
 *****************************************************************************/
 
-void ES8712_set_bank_base(int which, int base)
+void es8712_set_bank_base(int which, int base)
 {
 	struct es8712 *chip = sndti_token(SOUND_ES8712, which);
 	stream_update(chip->stream);
@@ -278,11 +278,11 @@ void ES8712_set_bank_base(int which, int base)
 
 /****************************************************************************
 
-    ES8712_set_frequency -- dynamically adjusts the frequency of a given ADPCM chip
+    es8712_set_frequency -- dynamically adjusts the frequency of a given ADPCM chip
 
 *****************************************************************************/
 
-void ES8712_set_frequency(int which, int frequency)
+void es8712_set_frequency(int which, int frequency)
 {
 	struct es8712 *chip = sndti_token(SOUND_ES8712, which);
 
@@ -295,11 +295,11 @@ void ES8712_set_frequency(int which, int frequency)
 
 /**********************************************************************************************
 
-    ES8712_play -- Begin playing the addressed sample
+    es8712_play -- Begin playing the addressed sample
 
 ***********************************************************************************************/
 
-void ES8712_play(int which)
+void es8712_play(int which)
 {
 	struct es8712 *chip = sndti_token(SOUND_ES8712, which);
 
@@ -337,8 +337,8 @@ void ES8712_play(int which)
 
 /**********************************************************************************************
 
-     ES8712_data_0_w -- generic data write functions
-     ES8712_data_1_w
+     es8712_data_0_w -- generic data write functions
+     es8712_data_1_w
 
 ***********************************************************************************************/
 
@@ -377,59 +377,59 @@ static void ES8712_data_w(int which, int offset, UINT32 data)
 		case 05:	chip->end   &= 0x0000ffff;
 					chip->end   |= ((data & 0x0f) << 16); break;
 		case 06:
-				ES8712_play(which);
+				es8712_play(which);
 				break;
 		default:	break;
 	}
 	chip->start &= 0xfffff; chip->end &= 0xfffff;
 }
 
-WRITE8_HANDLER( ES8712_data_0_w )
+WRITE8_HANDLER( es8712_data_0_w )
 {
 	ES8712_data_w(0, offset, data);
 }
 
-WRITE8_HANDLER( ES8712_data_1_w )
+WRITE8_HANDLER( es8712_data_1_w )
 {
 	ES8712_data_w(1, offset, data);
 }
 
-WRITE8_HANDLER( ES8712_data_2_w )
+WRITE8_HANDLER( es8712_data_2_w )
 {
 	ES8712_data_w(2, offset, data);
 }
 
-WRITE16_HANDLER( ES8712_data_0_lsb_w )
+WRITE16_HANDLER( es8712_data_0_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
 		ES8712_data_w(0, offset, data & 0xff);
 }
 
-WRITE16_HANDLER( ES8712_data_1_lsb_w )
+WRITE16_HANDLER( es8712_data_1_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
 		ES8712_data_w(1, offset, data & 0xff);
 }
 
-WRITE16_HANDLER( ES8712_data_2_lsb_w )
+WRITE16_HANDLER( es8712_data_2_lsb_w )
 {
 	if (ACCESSING_BITS_0_7)
 		ES8712_data_w(2, offset, data & 0xff);
 }
 
-WRITE16_HANDLER( ES8712_data_0_msb_w )
+WRITE16_HANDLER( es8712_data_0_msb_w )
 {
 	if (ACCESSING_BITS_8_15)
 		ES8712_data_w(0, offset, data >> 8);
 }
 
-WRITE16_HANDLER( ES8712_data_1_msb_w )
+WRITE16_HANDLER( es8712_data_1_msb_w )
 {
 	if (ACCESSING_BITS_8_15)
 		ES8712_data_w(1, offset, data >> 8);
 }
 
-WRITE16_HANDLER( ES8712_data_2_msb_w )
+WRITE16_HANDLER( es8712_data_2_msb_w )
 {
 	if (ACCESSING_BITS_8_15)
 		ES8712_data_w(2, offset, data >> 8);
diff --git a/src/emu/sound/es8712.h b/src/emu/sound/es8712.h
index 053d7cbc81c..955bdd96f09 100644
--- a/src/emu/sound/es8712.h
+++ b/src/emu/sound/es8712.h
@@ -1,20 +1,22 @@
-#ifndef ES8712_H
-#define ES8712_H
+#pragma once
+
+#ifndef __ES8712_H__
+#define __ES8712_H__
 
 /* An interface for the ES8712 ADPCM chip */
 
-void ES8712_play(int which);
-void ES8712_set_bank_base(int which, int base);
-void ES8712_set_frequency(int which, int frequency);
+void es8712_play(int which);
+void es8712_set_bank_base(int which, int base);
+void es8712_set_frequency(int which, int frequency);
 
-WRITE8_HANDLER( ES8712_data_0_w );
-WRITE8_HANDLER( ES8712_data_1_w );
-WRITE8_HANDLER( ES8712_data_2_w );
-WRITE16_HANDLER( ES8712_data_0_lsb_w );
-WRITE16_HANDLER( ES8712_data_1_lsb_w );
-WRITE16_HANDLER( ES8712_data_2_lsb_w );
-WRITE16_HANDLER( ES8712_data_0_msb_w );
-WRITE16_HANDLER( ES8712_data_1_msb_w );
-WRITE16_HANDLER( ES8712_data_2_msb_w );
+WRITE8_HANDLER( es8712_data_0_w );
+WRITE8_HANDLER( es8712_data_1_w );
+WRITE8_HANDLER( es8712_data_2_w );
+WRITE16_HANDLER( es8712_data_0_lsb_w );
+WRITE16_HANDLER( es8712_data_1_lsb_w );
+WRITE16_HANDLER( es8712_data_2_lsb_w );
+WRITE16_HANDLER( es8712_data_0_msb_w );
+WRITE16_HANDLER( es8712_data_1_msb_w );
+WRITE16_HANDLER( es8712_data_2_msb_w );
 
-#endif
+#endif /* __ES8712_H__ */
diff --git a/src/emu/sound/filter.h b/src/emu/sound/filter.h
index 036813f1569..b1a87e2b77d 100644
--- a/src/emu/sound/filter.h
+++ b/src/emu/sound/filter.h
@@ -1,10 +1,12 @@
-#ifndef __FILTER_H
-#define __FILTER_H
+#pragma once
+
+#ifndef __FILTER_H__
+#define __FILTER_H__
 
 /* Max filter order */
 #define FILTER_ORDER_MAX 51
 
-/* Define to use interger calculation */
+/* Define to use integer calculation */
 #define FILTER_USE_INT
 
 #ifdef FILTER_USE_INT
@@ -14,15 +16,19 @@ typedef int filter_real;
 typedef double filter_real;
 #endif
 
-typedef struct filter_struct {
+typedef struct _filter filter;
+struct _filter
+{
 	filter_real xcoeffs[(FILTER_ORDER_MAX+1)/2];
 	unsigned order;
-} filter;
+};
 
-typedef struct filter_state_struct {
+typedef struct _filter_state filter_state;
+struct _filter_state
+{
 	unsigned prev_mac;
 	filter_real xprev[FILTER_ORDER_MAX];
-} filter_state;
+};
 
 /* Allocate a FIR Low Pass filter */
 filter* filter_lp_fir_alloc(double freq, int order);
@@ -59,12 +65,14 @@ filter_real filter_compute(filter* f, filter_state* s);
 
 #define Q_TO_DAMP(q)	(1.0/q)
 
-typedef struct filter2_context_struct {
+typedef struct _filter2_context filter2_context;
+struct _filter2_context
+{
 	double x0, x1, x2;	/* x[k], x[k-1], x[k-2], current and previous 2 input values */
 	double y0, y1, y2;	/* y[k], y[k-1], y[k-2], current and previous 2 output values */
 	double a1, a2;		/* digital filter coefficients, denominator */
 	double b0, b1, b2;	/* digital filter coefficients, numerator */
-} filter2_context;
+};
 
 
 /* Setup the filter context based on the passed filter type info.
@@ -109,4 +117,4 @@ void filter2_step(filter2_context *filter2);
 void filter_opamp_m_bandpass_setup(double r1, double r2, double r3, double c1, double c2,
 					filter2_context *filter2);
 
-#endif
+#endif /* __FILTER_H__ */
diff --git a/src/emu/sound/flt_rc.h b/src/emu/sound/flt_rc.h
index b8e90ff15f6..90bd4c919c5 100644
--- a/src/emu/sound/flt_rc.h
+++ b/src/emu/sound/flt_rc.h
@@ -1,4 +1,6 @@
-#ifndef FLT_RC_H
+#pragma once
+
+#ifndef __FLT_RC_H__
 #define FLT_RC_H
 
 #include "rescap.h"
@@ -56,4 +58,4 @@ extern const flt_rc_config flt_rc_ac_default;
 
 void filter_rc_set_RC(int num, int type, double R1, double R2, double R3, double C);
 
-#endif
+#endif /* __FLT_RC_H__ */
diff --git a/src/emu/sound/flt_vol.h b/src/emu/sound/flt_vol.h
index a0db7bea16f..2c050635b26 100644
--- a/src/emu/sound/flt_vol.h
+++ b/src/emu/sound/flt_vol.h
@@ -1,6 +1,8 @@
-#ifndef FLT_VOL_H
-#define FLT_VOL_H
+#pragma once
+
+#ifndef __FLT_VOL_H__
+#define __FLT_VOL_H__
 
 void flt_volume_set_volume(int num, float volume);
 
-#endif
+#endif /* __FLT_VOL_H__ */
diff --git a/src/emu/sound/fm.c b/src/emu/sound/fm.c
index 52f5ae590ce..27a6b77d434 100644
--- a/src/emu/sound/fm.c
+++ b/src/emu/sound/fm.c
@@ -2190,7 +2190,7 @@ typedef struct
 } YM2203;
 
 /* Generate samples for one of the YM2203s */
-void YM2203UpdateOne(void *chip, FMSAMPLE *buffer, int length)
+void ym2203_update_one(void *chip, FMSAMPLE *buffer, int length)
 {
 	YM2203 *F2203 = chip;
 	FM_OPN *OPN =   &F2203->OPN;
@@ -2273,7 +2273,7 @@ void YM2203UpdateOne(void *chip, FMSAMPLE *buffer, int length)
 }
 
 /* ---------- reset one of chip ---------- */
-void YM2203ResetChip(void *chip)
+void ym2203_reset_chip(void *chip)
 {
 	int i;
 	YM2203 *F2203 = chip;
@@ -2300,7 +2300,7 @@ void YM2203ResetChip(void *chip)
 }
 
 #ifdef __STATE_H__
-void YM2203Postload(void *chip)
+void ym2203_postload(void *chip)
 {
 	if (chip)
 	{
@@ -2351,7 +2351,7 @@ static void YM2203_save_state(YM2203 *F2203, int index)
    'clock' is the chip clock in Hz
    'rate' is sampling rate
 */
-void * YM2203Init(void *param, int index, int clock, int rate,
+void * ym2203_init(void *param, int index, int clock, int rate,
                FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
 {
 	YM2203 *F2203;
@@ -2377,7 +2377,7 @@ void * YM2203Init(void *param, int index, int clock, int rate,
 	F2203->OPN.ST.timer_handler = timer_handler;
 	F2203->OPN.ST.IRQ_Handler   = IRQHandler;
 	F2203->OPN.ST.SSG           = ssg;
-	YM2203ResetChip(F2203);
+	ym2203_reset_chip(F2203);
 
 #ifdef __STATE_H__
 	YM2203_save_state(F2203, index);
@@ -2386,7 +2386,7 @@ void * YM2203Init(void *param, int index, int clock, int rate,
 }
 
 /* shut down emulator */
-void YM2203Shutdown(void *chip)
+void ym2203_shutdown(void *chip)
 {
 	YM2203 *FM2203 = chip;
 
@@ -2395,7 +2395,7 @@ void YM2203Shutdown(void *chip)
 }
 
 /* YM2203 I/O interface */
-int YM2203Write(void *chip,int a,UINT8 v)
+int ym2203_write(void *chip,int a,UINT8 v)
 {
 	YM2203 *F2203 = chip;
 	FM_OPN *OPN = &F2203->OPN;
@@ -2422,12 +2422,12 @@ int YM2203Write(void *chip,int a,UINT8 v)
 			(*OPN->ST.SSG->write)(OPN->ST.param,a,v);
 			break;
 		case 0x20:	/* 0x20-0x2f : Mode section */
-			YM2203UpdateReq(OPN->ST.param);
+			ym2203_update_req(OPN->ST.param);
 			/* write register */
 			OPNWriteMode(OPN,addr,v);
 			break;
 		default:	/* 0x30-0xff : OPN section */
-			YM2203UpdateReq(OPN->ST.param);
+			ym2203_update_req(OPN->ST.param);
 			/* write register */
 			OPNWriteReg(OPN,addr,v);
 		}
@@ -2436,7 +2436,7 @@ int YM2203Write(void *chip,int a,UINT8 v)
 	return OPN->ST.irq;
 }
 
-UINT8 YM2203Read(void *chip,int a)
+UINT8 ym2203_read(void *chip,int a)
 {
 	YM2203 *F2203 = chip;
 	int addr = F2203->OPN.ST.address;
@@ -2453,7 +2453,7 @@ UINT8 YM2203Read(void *chip,int a)
 	return ret;
 }
 
-int YM2203TimerOver(void *chip,int c)
+int ym2203_timer_over(void *chip,int c)
 {
 	YM2203 *F2203 = chip;
 
@@ -2463,7 +2463,7 @@ int YM2203TimerOver(void *chip,int c)
 	}
 	else
 	{	/* Timer A */
-		YM2203UpdateReq(F2203->OPN.ST.param);
+		ym2203_update_req(F2203->OPN.ST.param);
 		/* timer update */
 		TimerAOver( &(F2203->OPN.ST) );
 		/* CSM mode key,TL control */
@@ -3362,7 +3362,7 @@ INLINE void YM2608IRQMaskWrite(FM_OPN *OPN, YM2608 *F2608, int v)
 }
 
 /* Generate samples for one of the YM2608s */
-void YM2608UpdateOne(void *chip, FMSAMPLE **buffer, int length)
+void ym2608_update_one(void *chip, FMSAMPLE **buffer, int length)
 {
 	YM2608 *F2608 = chip;
 	FM_OPN *OPN   = &F2608->OPN;
@@ -3502,7 +3502,7 @@ void YM2608UpdateOne(void *chip, FMSAMPLE **buffer, int length)
 
 }
 #ifdef __STATE_H__
-void YM2608Postload(void *chip)
+void ym2608_postload(void *chip)
 {
 	if (chip)
 	{
@@ -3578,7 +3578,7 @@ static void YM2608_deltat_status_reset(void *chip, UINT8 changebits)
 	FM_STATUS_RESET(&(F2608->OPN.ST), changebits);
 }
 /* YM2608(OPNA) */
-void * YM2608Init(void *param, int index, int clock, int rate,
+void * ym2608_init(void *param, int index, int clock, int rate,
                void *pcmrom,int pcmsize,
                FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
 {
@@ -3625,7 +3625,7 @@ void * YM2608Init(void *param, int index, int clock, int rate,
 	F2608->pcmbuf   = YM2608_ADPCM_ROM;
 	F2608->pcm_size = 0x2000;
 
-	YM2608ResetChip(F2608);
+	ym2608_reset_chip(F2608);
 
 	Init_ADPCMATable();
 
@@ -3636,7 +3636,7 @@ void * YM2608Init(void *param, int index, int clock, int rate,
 }
 
 /* shut down emulator */
-void YM2608Shutdown(void *chip)
+void ym2608_shutdown(void *chip)
 {
 	YM2608 *F2608 = chip;
 
@@ -3645,7 +3645,7 @@ void YM2608Shutdown(void *chip)
 }
 
 /* reset one of chips */
-void YM2608ResetChip(void *chip)
+void ym2608_reset_chip(void *chip)
 {
 	int i;
 	YM2608 *F2608 = chip;
@@ -3727,7 +3727,7 @@ void YM2608ResetChip(void *chip)
 /* n = number  */
 /* a = address */
 /* v = value   */
-int YM2608Write(void *chip, int a,UINT8 v)
+int ym2608_write(void *chip, int a,UINT8 v)
 {
 	YM2608 *F2608 = chip;
 	FM_OPN *OPN   = &F2608->OPN;
@@ -3765,7 +3765,7 @@ int YM2608Write(void *chip, int a,UINT8 v)
 			(*OPN->ST.SSG->write)(OPN->ST.param,a,v);
 			break;
 		case 0x10:	/* 0x10-0x1f : Rhythm section */
-			YM2608UpdateReq(OPN->ST.param);
+			ym2608_update_req(OPN->ST.param);
 			FM_ADPCMAWrite(F2608,addr-0x10,v);
 			break;
 		case 0x20:	/* Mode Register */
@@ -3775,12 +3775,12 @@ int YM2608Write(void *chip, int a,UINT8 v)
 				YM2608IRQMaskWrite(OPN, F2608, v);
 				break;
 			default:
-				YM2608UpdateReq(OPN->ST.param);
+				ym2608_update_req(OPN->ST.param);
 				OPNWriteMode(OPN,addr,v);
 			}
 			break;
 		default:	/* OPN section */
-			YM2608UpdateReq(OPN->ST.param);
+			ym2608_update_req(OPN->ST.param);
 			OPNWriteReg(OPN,addr,v);
 		}
 		break;
@@ -3796,7 +3796,7 @@ int YM2608Write(void *chip, int a,UINT8 v)
 
 		addr = OPN->ST.address;
 		F2608->REGS[addr | 0x100] = v;
-		YM2608UpdateReq(OPN->ST.param);
+		ym2608_update_req(OPN->ST.param);
 		switch( addr & 0xf0 )
 		{
 		case 0x00:	/* DELTAT PORT */
@@ -3823,7 +3823,7 @@ int YM2608Write(void *chip, int a,UINT8 v)
 	return OPN->ST.irq;
 }
 
-UINT8 YM2608Read(void *chip,int a)
+UINT8 ym2608_read(void *chip,int a)
 {
 	YM2608 *F2608 = chip;
 	int addr = F2608->OPN.ST.address;
@@ -3863,7 +3863,7 @@ UINT8 YM2608Read(void *chip,int a)
 	return ret;
 }
 
-int YM2608TimerOver(void *chip,int c)
+int ym2608_timer_over(void *chip,int c)
 {
 	YM2608 *F2608 = chip;
 
@@ -3883,7 +3883,7 @@ int YM2608TimerOver(void *chip,int c)
 		break;
 	case 0:
 		{	/* Timer A */
-			YM2608UpdateReq(F2608->OPN.ST.param);
+			ym2608_update_req(F2608->OPN.ST.param);
 			/* timer update */
 			TimerAOver( &(F2608->OPN.ST) );
 			/* CSM mode key,TL controll */
@@ -3908,7 +3908,7 @@ int YM2608TimerOver(void *chip,int c)
 /* YM2610(OPNB) */
 
 /* Generate samples for one of the YM2610s */
-void YM2610UpdateOne(void *chip, FMSAMPLE **buffer, int length)
+void ym2610_update_one(void *chip, FMSAMPLE **buffer, int length)
 {
 	YM2610 *F2610 = chip;
 	FM_OPN *OPN   = &F2610->OPN;
@@ -4045,7 +4045,7 @@ void YM2610UpdateOne(void *chip, FMSAMPLE **buffer, int length)
 
 #if BUILD_YM2610B
 /* Generate samples for one of the YM2610Bs */
-void YM2610BUpdateOne(void *chip, FMSAMPLE **buffer, int length)
+void ym2610b_update_one(void *chip, FMSAMPLE **buffer, int length)
 {
 	YM2610 *F2610 = chip;
 	FM_OPN *OPN   = &F2610->OPN;
@@ -4185,7 +4185,7 @@ void YM2610BUpdateOne(void *chip, FMSAMPLE **buffer, int length)
 
 
 #ifdef __STATE_H__
-void YM2610Postload(void *chip)
+void ym2610_postload(void *chip)
 {
 	if (chip)
 	{
@@ -4265,7 +4265,7 @@ static void YM2610_deltat_status_reset(void *chip, UINT8 changebits)
 	F2610->adpcm_arrivedEndAddress &= (~changebits);
 }
 
-void *YM2610Init(void *param, int index, int clock, int rate,
+void *ym2610_init(void *param, int index, int clock, int rate,
                void *pcmroma,int pcmsizea,void *pcmromb,int pcmsizeb,
                FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg)
 
@@ -4306,7 +4306,7 @@ void *YM2610Init(void *param, int index, int clock, int rate,
 	F2610->deltaT.status_change_which_chip = F2610;
 	F2610->deltaT.status_change_EOS_bit = 0x80;	/* status flag: set bit7 on End Of Sample */
 
-	YM2610ResetChip(F2610);
+	ym2610_reset_chip(F2610);
 
 	Init_ADPCMATable();
 #ifdef __STATE_H__
@@ -4316,7 +4316,7 @@ void *YM2610Init(void *param, int index, int clock, int rate,
 }
 
 /* shut down emulator */
-void YM2610Shutdown(void *chip)
+void ym2610_shutdown(void *chip)
 {
 	YM2610 *F2610 = chip;
 
@@ -4325,7 +4325,7 @@ void YM2610Shutdown(void *chip)
 }
 
 /* reset one of chip */
-void YM2610ResetChip(void *chip)
+void ym2610_reset_chip(void *chip)
 {
 	int i;
 	YM2610 *F2610 = chip;
@@ -4391,7 +4391,7 @@ void YM2610ResetChip(void *chip)
 /* n = number  */
 /* a = address */
 /* v = value   */
-int YM2610Write(void *chip, int a, UINT8 v)
+int ym2610_write(void *chip, int a, UINT8 v)
 {
 	YM2610 *F2610 = chip;
 	FM_OPN *OPN   = &F2610->OPN;
@@ -4422,7 +4422,7 @@ int YM2610Write(void *chip, int a, UINT8 v)
 			(*OPN->ST.SSG->write)(OPN->ST.param,a,v);
 			break;
 		case 0x10: /* DeltaT ADPCM */
-			YM2610UpdateReq(OPN->ST.param);
+			ym2610_update_req(OPN->ST.param);
 
 			switch(addr)
 			{
@@ -4462,11 +4462,11 @@ int YM2610Write(void *chip, int a, UINT8 v)
 
 			break;
 		case 0x20:	/* Mode Register */
-			YM2610UpdateReq(OPN->ST.param);
+			ym2610_update_req(OPN->ST.param);
 			OPNWriteMode(OPN,addr,v);
 			break;
 		default:	/* OPN section */
-			YM2610UpdateReq(OPN->ST.param);
+			ym2610_update_req(OPN->ST.param);
 			/* write register */
 			OPNWriteReg(OPN,addr,v);
 		}
@@ -4481,7 +4481,7 @@ int YM2610Write(void *chip, int a, UINT8 v)
 		if (F2610->addr_A1 != 1)
 			break;	/* verified on real YM2608 */
 
-		YM2610UpdateReq(OPN->ST.param);
+		ym2610_update_req(OPN->ST.param);
 		addr = OPN->ST.address;
 		F2610->REGS[addr | 0x100] = v;
 		if( addr < 0x30 )
@@ -4493,7 +4493,7 @@ int YM2610Write(void *chip, int a, UINT8 v)
 	return OPN->ST.irq;
 }
 
-UINT8 YM2610Read(void *chip,int a)
+UINT8 ym2610_read(void *chip,int a)
 {
 	YM2610 *F2610 = chip;
 	int addr = F2610->OPN.ST.address;
@@ -4521,7 +4521,7 @@ UINT8 YM2610Read(void *chip,int a)
 	return ret;
 }
 
-int YM2610TimerOver(void *chip,int c)
+int ym2610_timer_over(void *chip,int c)
 {
 	YM2610 *F2610 = chip;
 
@@ -4531,7 +4531,7 @@ int YM2610TimerOver(void *chip,int c)
 	}
 	else
 	{	/* Timer A */
-		YM2610UpdateReq(F2610->OPN.ST.param);
+		ym2610_update_req(F2610->OPN.ST.param);
 		/* timer update */
 		TimerAOver( &(F2610->OPN.ST) );
 		/* CSM mode key,TL controll */
@@ -4567,7 +4567,7 @@ typedef struct
 static int dacen;
 
 /* Generate samples for one of the YM2612s */
-void YM2612UpdateOne(void *chip, FMSAMPLE **buffer, int length)
+void ym2612_update_one(void *chip, FMSAMPLE **buffer, int length)
 {
 	YM2612 *F2612 = chip;
 	FM_OPN *OPN   = &F2612->OPN;
@@ -4687,7 +4687,7 @@ void YM2612UpdateOne(void *chip, FMSAMPLE **buffer, int length)
 }
 
 #ifdef __STATE_H__
-void YM2612Postload(void *chip)
+void ym2612_postload(void *chip)
 {
 	if (chip)
 	{
@@ -4734,7 +4734,7 @@ static void YM2612_save_state(YM2612 *F2612, int index)
 #endif /* _STATE_H */
 
 /* initialize YM2612 emulator(s) */
-void * YM2612Init(void *param, int index, int clock, int rate,
+void * ym2612_init(void *param, int index, int clock, int rate,
                FM_TIMERHANDLER timer_handler,FM_IRQHANDLER IRQHandler)
 {
 	YM2612 *F2612;
@@ -4761,7 +4761,7 @@ void * YM2612Init(void *param, int index, int clock, int rate,
 	/* Extend handler */
 	F2612->OPN.ST.timer_handler = timer_handler;
 	F2612->OPN.ST.IRQ_Handler   = IRQHandler;
-	YM2612ResetChip(F2612);
+	ym2612_reset_chip(F2612);
 
 #ifdef __STATE_H__
 	YM2612_save_state(F2612, index);
@@ -4770,7 +4770,7 @@ void * YM2612Init(void *param, int index, int clock, int rate,
 }
 
 /* shut down emulator */
-void YM2612Shutdown(void *chip)
+void ym2612_shutdown(void *chip)
 {
 	YM2612 *F2612 = chip;
 
@@ -4779,7 +4779,7 @@ void YM2612Shutdown(void *chip)
 }
 
 /* reset one of chip */
-void YM2612ResetChip(void *chip)
+void ym2612_reset_chip(void *chip)
 {
 	int i;
 	YM2612 *F2612 = chip;
@@ -4816,7 +4816,7 @@ void YM2612ResetChip(void *chip)
 /* n = number  */
 /* a = address */
 /* v = value   */
-int YM2612Write(void *chip, int a, UINT8 v)
+int ym2612_write(void *chip, int a, UINT8 v)
 {
 	YM2612 *F2612 = chip;
 	int addr;
@@ -4841,7 +4841,7 @@ int YM2612Write(void *chip, int a, UINT8 v)
 			switch( addr )
 			{
 			case 0x2a:	/* DAC data (YM2612) */
-				YM2612UpdateReq(F2612->OPN.ST.param);
+				ym2612_update_req(F2612->OPN.ST.param);
 				F2612->dacout = ((int)v - 0x80) << 7;	/* level unknown */
 				break;
 			case 0x2b:	/* DAC Sel  (YM2612) */
@@ -4849,13 +4849,13 @@ int YM2612Write(void *chip, int a, UINT8 v)
 				F2612->dacen = v & 0x80;
 				break;
 			default:	/* OPN section */
-				YM2612UpdateReq(F2612->OPN.ST.param);
+				ym2612_update_req(F2612->OPN.ST.param);
 				/* write register */
 				OPNWriteMode(&(F2612->OPN),addr,v);
 			}
 			break;
 		default:	/* 0x30-0xff OPN section */
-			YM2612UpdateReq(F2612->OPN.ST.param);
+			ym2612_update_req(F2612->OPN.ST.param);
 			/* write register */
 			OPNWriteReg(&(F2612->OPN),addr,v);
 		}
@@ -4872,14 +4872,14 @@ int YM2612Write(void *chip, int a, UINT8 v)
 
 		addr = F2612->OPN.ST.address;
 		F2612->REGS[addr | 0x100] = v;
-		YM2612UpdateReq(F2612->OPN.ST.param);
+		ym2612_update_req(F2612->OPN.ST.param);
 		OPNWriteReg(&(F2612->OPN),addr | 0x100,v);
 		break;
 	}
 	return F2612->OPN.ST.irq;
 }
 
-UINT8 YM2612Read(void *chip,int a)
+UINT8 ym2612_read(void *chip,int a)
 {
 	YM2612 *F2612 = chip;
 
@@ -4895,7 +4895,7 @@ UINT8 YM2612Read(void *chip,int a)
 	return 0;
 }
 
-int YM2612TimerOver(void *chip,int c)
+int ym2612_timer_over(void *chip,int c)
 {
 	YM2612 *F2612 = chip;
 
@@ -4905,7 +4905,7 @@ int YM2612TimerOver(void *chip,int c)
 	}
 	else
 	{	/* Timer A */
-		YM2612UpdateReq(F2612->OPN.ST.param);
+		ym2612_update_req(F2612->OPN.ST.param);
 		/* timer update */
 		TimerAOver( &(F2612->OPN.ST) );
 		/* CSM mode key,TL controll */
diff --git a/src/emu/sound/fm.h b/src/emu/sound/fm.h
index ff7b9e4968c..6e8650de0e1 100644
--- a/src/emu/sound/fm.h
+++ b/src/emu/sound/fm.h
@@ -2,8 +2,11 @@
   File: fm.h -- header file for software emulation for FM sound generator
 
 */
-#ifndef _H_FM_FM_
-#define _H_FM_FM_
+
+#pragma once
+
+#ifndef __FM_H__
+#define __FM_H__
 
 /* --- select emulation chips --- */
 #define BUILD_YM2203  (HAS_YM2203)		/* build YM2203(OPN)   emulator */
@@ -47,24 +50,27 @@ struct _ssg_callbacks
 
 #if BUILD_YM2203
   /* in 2203intf.c */
-  void YM2203UpdateRequest(void *param);
-  #define YM2203UpdateReq(chip) YM2203UpdateRequest(chip)
-#endif
+  void ym2203_update_request(void *param);
+  #define ym2203_update_req(chip) ym2203_update_request(chip)
+#endif /* BUILD_YM2203 */
+
 #if BUILD_YM2608
   /* in 2608intf.c */
-  void YM2608UpdateRequest(void *param);
-  #define YM2608UpdateReq(chip) YM2608UpdateRequest(chip);
-#endif
+  void ym2608_update_request(void *param);
+  #define ym2608_update_req(chip) ym2608_update_request(chip);
+#endif /* BUILD_YM2608 */
+
 #if (BUILD_YM2610||BUILD_YM2610B)
   /* in 2610intf.c */
-  void YM2610UpdateRequest(void *param);
-  #define YM2610UpdateReq(chip) YM2610UpdateRequest(chip);
-#endif
+  void ym2610_update_request(void *param);
+  #define ym2610_update_req(chip) ym2610_update_request(chip);
+#endif /* (BUILD_YM2610||BUILD_YM2610B) */
+
 #if (BUILD_YM2612||BUILD_YM3438)
   /* in 2612intf.c */
-  void YM2612UpdateRequest(void *param);
-  #define YM2612UpdateReq(chip) YM2612UpdateRequest(chip);
-#endif
+  void ym2612_update_request(void *param);
+  #define ym2612_update_req(chip) ym2612_update_request(chip);
+#endif /* (BUILD_YM2612||BUILD_YM3438) */
 
 /* compiler dependence */
 #if 0
@@ -76,7 +82,7 @@ typedef unsigned int	UINT32;  /* unsigned 32bit */
 typedef signed char		INT8;    /* signed  8bit   */
 typedef signed short	INT16;   /* signed 16bit   */
 typedef signed int		INT32;   /* signed 32bit   */
-#endif
+#endif /* OSD_CPU_H */
 #endif
 
 #ifndef INLINE
@@ -121,92 +127,93 @@ typedef void (*FM_IRQHANDLER)(void *param,int irq);
 ** 'IRQHandler'    IRQ callback handler when changed IRQ level
 ** return      0 = success
 */
-void * YM2203Init(void *param, int index, int baseclock, int rate,
+void * ym2203_init(void *param, int index, int baseclock, int rate,
                FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
 
 /*
 ** shutdown the YM2203 emulators
 */
-void YM2203Shutdown(void *chip);
+void ym2203_shutdown(void *chip);
 
 /*
 ** reset all chip registers for YM2203 number 'num'
 */
-void YM2203ResetChip(void *chip);
+void ym2203_reset_chip(void *chip);
 
 /*
 ** update one of chip
 */
-void YM2203UpdateOne(void *chip, FMSAMPLE *buffer, int length);
+void ym2203_update_one(void *chip, FMSAMPLE *buffer, int length);
 
 /*
 ** Write
 ** return : InterruptLevel
 */
-int YM2203Write(void *chip,int a,unsigned char v);
+int ym2203_write(void *chip,int a,unsigned char v);
 
 /*
 ** Read
 ** return : InterruptLevel
 */
-unsigned char YM2203Read(void *chip,int a);
+unsigned char ym2203_read(void *chip,int a);
 
 /*
 **  Timer OverFlow
 */
-int YM2203TimerOver(void *chip, int c);
+int ym2203_timer_over(void *chip, int c);
 
 /*
 **  State Save
 */
-void YM2203Postload(void *chip);
+void ym2203_postload(void *chip);
 #endif /* BUILD_YM2203 */
 
 #if BUILD_YM2608
 /* -------------------- YM2608(OPNA) Interface -------------------- */
-void * YM2608Init(void *param, int index, int baseclock, int rate,
+void * ym2608_init(void *param, int index, int baseclock, int rate,
                void *pcmroma,int pcmsizea,
                FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
-void YM2608Shutdown(void *chip);
-void YM2608ResetChip(void *chip);
-void YM2608UpdateOne(void *chip, FMSAMPLE **buffer, int length);
+void ym2608_shutdown(void *chip);
+void ym2608_reset_chip(void *chip);
+void ym2608_update_one(void *chip, FMSAMPLE **buffer, int length);
 
-int YM2608Write(void *chip, int a,unsigned char v);
-unsigned char YM2608Read(void *chip,int a);
-int YM2608TimerOver(void *chip, int c );
-void YM2608Postload(void *chip);
+int ym2608_write(void *chip, int a,unsigned char v);
+unsigned char ym2608_read(void *chip,int a);
+int ym2608_timer_over(void *chip, int c );
+void ym2608_postload(void *chip);
 #endif /* BUILD_YM2608 */
 
 #if (BUILD_YM2610||BUILD_YM2610B)
 /* -------------------- YM2610(OPNB) Interface -------------------- */
-void * YM2610Init(void *param, int index, int baseclock, int rate,
+void * ym2610_init(void *param, int index, int baseclock, int rate,
                void *pcmroma,int pcmasize,void *pcmromb,int pcmbsize,
                FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler, const ssg_callbacks *ssg);
-void YM2610Shutdown(void *chip);
-void YM2610ResetChip(void *chip);
-void YM2610UpdateOne(void *chip, FMSAMPLE **buffer, int length);
-#if BUILD_YM2610B
-void YM2610BUpdateOne(void *chip, FMSAMPLE **buffer, int length);
-#endif
+void ym2610_shutdown(void *chip);
+void ym2610_reset_chip(void *chip);
+void ym2610_update_one(void *chip, FMSAMPLE **buffer, int length);
 
-int YM2610Write(void *chip, int a,unsigned char v);
-unsigned char YM2610Read(void *chip,int a);
-int YM2610TimerOver(void *chip, int c );
-void YM2610Postload(void *chip);
+#if BUILD_YM2610B
+void ym2610b_update_one(void *chip, FMSAMPLE **buffer, int length);
+#endif /* BUILD_YM2610B */
+
+int ym2610_write(void *chip, int a,unsigned char v);
+unsigned char ym2610_read(void *chip,int a);
+int ym2610_timer_over(void *chip, int c );
+void ym2610_postload(void *chip);
 #endif /* (BUILD_YM2610||BUILD_YM2610B) */
 
 #if (BUILD_YM2612||BUILD_YM3438)
-void * YM2612Init(void *param, int index, int baseclock, int rate,
+void * ym2612_init(void *param, int index, int baseclock, int rate,
                FM_TIMERHANDLER TimerHandler,FM_IRQHANDLER IRQHandler);
-void YM2612Shutdown(void *chip);
-void YM2612ResetChip(void *chip);
-void YM2612UpdateOne(void *chip, FMSAMPLE **buffer, int length);
+void ym2612_shutdown(void *chip);
+void ym2612_reset_chip(void *chip);
+void ym2612_update_one(void *chip, FMSAMPLE **buffer, int length);
 
-int YM2612Write(void *chip, int a,unsigned char v);
-unsigned char YM2612Read(void *chip,int a);
-int YM2612TimerOver(void *chip, int c );
-void YM2612Postload(void *chip);
+int ym2612_write(void *chip, int a,unsigned char v);
+unsigned char ym2612_read(void *chip,int a);
+int ym2612_timer_over(void *chip, int c );
+void ym2612_postload(void *chip);
 #endif /* (BUILD_YM2612||BUILD_YM3438) */
 
 
-#endif /* _H_FM_FM_ */
+#endif /* __FM_H__ */
diff --git a/src/emu/sound/fmopl.c b/src/emu/sound/fmopl.c
index d0892a98bf4..2ab9ed18719 100644
--- a/src/emu/sound/fmopl.c
+++ b/src/emu/sound/fmopl.c
@@ -22,12 +22,12 @@ Revision History:
 
 14-06-2003 Jarek Burczynski:
  - implemented all of the status register flags in Y8950 emulation
- - renamed Y8950SetDeltaTMemory() parameters from _rom_ to _mem_ since
+ - renamed y8950_set_delta_t_memory() parameters from _rom_ to _mem_ since
    they can be either RAM or ROM
 
 08-10-2002 Jarek Burczynski (thanks to Dox for the YM3526 chip)
- - corrected YM3526Read() to always set bit 2 and bit 1
-   to HIGH state - identical to YM3812Read (verified on real YM3526)
+ - corrected ym3526_read() to always set bit 2 and bit 1
+   to HIGH state - identical to ym3812_read (verified on real YM3526)
 
 04-28-2002 Jarek Burczynski:
  - binary exact Envelope Generator (verified on real YM3812);
@@ -35,7 +35,7 @@ Revision History:
    rates are 2 times slower and volume resolution is one bit less
  - modified interface functions (they no longer return pointer -
    that's internal to the emulator now):
-    - new wrapper functions for OPLCreate: YM3526Init(), YM3812Init() and Y8950Init()
+    - new wrapper functions for OPLCreate: ym3526_init(), ym3812_init() and y8950_init()
  - corrected 'off by one' error in feedback calculations (when feedback is off)
  - enabled waveform usage (credit goes to Vlad Romascanu and zazzal22)
  - speeded up noise generator calculations (Nicola Salmoria)
@@ -2164,60 +2164,60 @@ static int OPLTimerOver(FM_OPL *OPL,int c)
 
 #if (BUILD_YM3812)
 
-void * YM3812Init(int sndindex, UINT32 clock, UINT32 rate)
+void * ym3812_init(int sndindex, UINT32 clock, UINT32 rate)
 {
 	/* emulator create */
 	FM_OPL *YM3812 = OPLCreate(OPL_TYPE_YM3812,clock,rate);
 	if (YM3812)
 	{
 		OPL_save_state(YM3812, "YM3812", sndindex);
-		YM3812ResetChip(YM3812);
+		ym3812_reset_chip(YM3812);
 	}
 	return YM3812;
 }
 
-void YM3812Shutdown(void *chip)
+void ym3812_shutdown(void *chip)
 {
 	FM_OPL *YM3812 = chip;
 
 	/* emulator shutdown */
 	OPLDestroy(YM3812);
 }
-void YM3812ResetChip(void *chip)
+void ym3812_reset_chip(void *chip)
 {
 	FM_OPL *YM3812 = chip;
 	OPLResetChip(YM3812);
 }
 
-int YM3812Write(void *chip, int a, int v)
+int ym3812_write(void *chip, int a, int v)
 {
 	FM_OPL *YM3812 = chip;
 	return OPLWrite(YM3812, a, v);
 }
 
-unsigned char YM3812Read(void *chip, int a)
+unsigned char ym3812_read(void *chip, int a)
 {
 	FM_OPL *YM3812 = chip;
 	/* YM3812 always returns bit2 and bit1 in HIGH state */
 	return OPLRead(YM3812, a) | 0x06 ;
 }
-int YM3812TimerOver(void *chip, int c)
+int ym3812_timer_over(void *chip, int c)
 {
 	FM_OPL *YM3812 = chip;
 	return OPLTimerOver(YM3812, c);
 }
 
-void YM3812SetTimerHandler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
+void ym3812_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
 {
 	FM_OPL *YM3812 = chip;
 	OPLSetTimerHandler(YM3812, timer_handler, param);
 }
-void YM3812SetIRQHandler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
+void ym3812_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
 {
 	FM_OPL *YM3812 = chip;
 	OPLSetIRQHandler(YM3812, IRQHandler, param);
 }
-void YM3812SetUpdateHandler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
+void ym3812_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
 {
 	FM_OPL *YM3812 = chip;
 	OPLSetUpdateHandler(YM3812, UpdateHandler, param);
@@ -2231,7 +2231,7 @@ void YM3812SetUpdateHandler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *par
 ** '*buffer' is the output buffer pointer
 ** 'length' is the number of samples that should be generated
 */
-void YM3812UpdateOne(void *chip, OPLSAMPLE *buffer, int length)
+void ym3812_update_one(void *chip, OPLSAMPLE *buffer, int length)
 {
 	FM_OPL		*OPL = chip;
 	UINT8		rhythm = OPL->rhythm&0x20;
@@ -2300,59 +2300,59 @@ void YM3812UpdateOne(void *chip, OPLSAMPLE *buffer, int length)
 
 #if (BUILD_YM3526)
 
-void *YM3526Init(int sndindex, UINT32 clock, UINT32 rate)
+void *ym3526_init(int sndindex, UINT32 clock, UINT32 rate)
 {
 	/* emulator create */
 	FM_OPL *YM3526 = OPLCreate(OPL_TYPE_YM3526,clock,rate);
 	if (YM3526)
 	{
 		OPL_save_state(YM3526, "YM3526", sndindex);
-		YM3526ResetChip(YM3526);
+		ym3526_reset_chip(YM3526);
 	}
 	return YM3526;
 }
 
-void YM3526Shutdown(void *chip)
+void ym3526_shutdown(void *chip)
 {
 	FM_OPL *YM3526 = chip;
 	/* emulator shutdown */
 	OPLDestroy(YM3526);
 }
-void YM3526ResetChip(void *chip)
+void ym3526_reset_chip(void *chip)
 {
 	FM_OPL *YM3526 = chip;
 	OPLResetChip(YM3526);
 }
 
-int YM3526Write(void *chip, int a, int v)
+int ym3526_write(void *chip, int a, int v)
 {
 	FM_OPL *YM3526 = chip;
 	return OPLWrite(YM3526, a, v);
 }
 
-unsigned char YM3526Read(void *chip, int a)
+unsigned char ym3526_read(void *chip, int a)
 {
 	FM_OPL *YM3526 = chip;
 	/* YM3526 always returns bit2 and bit1 in HIGH state */
 	return OPLRead(YM3526, a) | 0x06 ;
 }
-int YM3526TimerOver(void *chip, int c)
+int ym3526_timer_over(void *chip, int c)
 {
 	FM_OPL *YM3526 = chip;
 	return OPLTimerOver(YM3526, c);
 }
 
-void YM3526SetTimerHandler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
+void ym3526_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
 {
 	FM_OPL *YM3526 = chip;
 	OPLSetTimerHandler(YM3526, timer_handler, param);
 }
-void YM3526SetIRQHandler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
+void ym3526_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
 {
 	FM_OPL *YM3526 = chip;
 	OPLSetIRQHandler(YM3526, IRQHandler, param);
 }
-void YM3526SetUpdateHandler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
+void ym3526_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
 {
 	FM_OPL *YM3526 = chip;
 	OPLSetUpdateHandler(YM3526, UpdateHandler, param);
@@ -2366,7 +2366,7 @@ void YM3526SetUpdateHandler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *par
 ** '*buffer' is the output buffer pointer
 ** 'length' is the number of samples that should be generated
 */
-void YM3526UpdateOne(void *chip, OPLSAMPLE *buffer, int length)
+void ym3526_update_one(void *chip, OPLSAMPLE *buffer, int length)
 {
 	FM_OPL		*OPL = chip;
 	UINT8		rhythm = OPL->rhythm&0x20;
@@ -2447,7 +2447,7 @@ static void Y8950_deltat_status_reset(void *chip, UINT8 changebits)
 	OPL_STATUS_RESET(Y8950, changebits);
 }
 
-void *Y8950Init(int sndindex, UINT32 clock, UINT32 rate)
+void *y8950_init(int sndindex, UINT32 clock, UINT32 rate)
 {
 	/* emulator create */
 	FM_OPL *Y8950 = OPLCreate(OPL_TYPE_Y8950,clock,rate);
@@ -2463,58 +2463,58 @@ void *Y8950Init(int sndindex, UINT32 clock, UINT32 rate)
 		/*Y8950->deltat->read_time  = 8.0 / clock;*/		/* a single byte read takes 8 cycles of main clock */
 		/* reset */
 		OPL_save_state(Y8950, "Y8950", sndindex);
-		Y8950ResetChip(Y8950);
+		y8950_reset_chip(Y8950);
 	}
 
 	return Y8950;
 }
 
-void Y8950Shutdown(void *chip)
+void y8950_shutdown(void *chip)
 {
 	FM_OPL *Y8950 = chip;
 	/* emulator shutdown */
 	OPLDestroy(Y8950);
 }
-void Y8950ResetChip(void *chip)
+void y8950_reset_chip(void *chip)
 {
 	FM_OPL *Y8950 = chip;
 	OPLResetChip(Y8950);
 }
 
-int Y8950Write(void *chip, int a, int v)
+int y8950_write(void *chip, int a, int v)
 {
 	FM_OPL *Y8950 = chip;
 	return OPLWrite(Y8950, a, v);
 }
 
-unsigned char Y8950Read(void *chip, int a)
+unsigned char y8950_read(void *chip, int a)
 {
 	FM_OPL *Y8950 = chip;
 	return OPLRead(Y8950, a);
 }
-int Y8950TimerOver(void *chip, int c)
+int y8950_timer_over(void *chip, int c)
 {
 	FM_OPL *Y8950 = chip;
 	return OPLTimerOver(Y8950, c);
 }
 
-void Y8950SetTimerHandler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
+void y8950_set_timer_handler(void *chip, OPL_TIMERHANDLER timer_handler, void *param)
 {
 	FM_OPL *Y8950 = chip;
 	OPLSetTimerHandler(Y8950, timer_handler, param);
 }
-void Y8950SetIRQHandler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
+void y8950_set_irq_handler(void *chip,OPL_IRQHANDLER IRQHandler,void *param)
 {
 	FM_OPL *Y8950 = chip;
 	OPLSetIRQHandler(Y8950, IRQHandler, param);
 }
-void Y8950SetUpdateHandler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
+void y8950_set_update_handler(void *chip,OPL_UPDATEHANDLER UpdateHandler,void *param)
 {
 	FM_OPL *Y8950 = chip;
 	OPLSetUpdateHandler(Y8950, UpdateHandler, param);
 }
 
-void Y8950SetDeltaTMemory(void *chip, void * deltat_mem_ptr, int deltat_mem_size )
+void y8950_set_delta_t_memory(void *chip, void * deltat_mem_ptr, int deltat_mem_size )
 {
 	FM_OPL		*OPL = chip;
 	OPL->deltat->memory = (UINT8 *)(deltat_mem_ptr);
@@ -2528,7 +2528,7 @@ void Y8950SetDeltaTMemory(void *chip, void * deltat_mem_ptr, int deltat_mem_size
 ** '*buffer' is the output buffer pointer
 ** 'length' is the number of samples that should be generated
 */
-void Y8950UpdateOne(void *chip, OPLSAMPLE *buffer, int length)
+void y8950_update_one(void *chip, OPLSAMPLE *buffer, int length)
 {
 	int i;
 	FM_OPL		*OPL = chip;
@@ -2599,7 +2599,7 @@ void Y8950UpdateOne(void *chip, OPLSAMPLE *buffer, int length)
 
 }
 
-void Y8950SetPortHandler(void *chip,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,void * param)
+void y8950_set_port_handler(void *chip,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,void * param)
 {
 	FM_OPL		*OPL = chip;
 	OPL->porthandler_w = PortHandler_w;
@@ -2607,7 +2607,7 @@ void Y8950SetPortHandler(void *chip,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHAND
 	OPL->port_param = param;
 }
 
-void Y8950SetKeyboardHandler(void *chip,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,void * param)
+void y8950_set_keyboard_handler(void *chip,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,void * param)
 {
 	FM_OPL		*OPL = chip;
 	OPL->keyboardhandler_w = KeyboardHandler_w;
diff --git a/src/emu/sound/fmopl.h b/src/emu/sound/fmopl.h
index f9521144c22..9ba0f56cdb5 100644
--- a/src/emu/sound/fmopl.h
+++ b/src/emu/sound/fmopl.h
@@ -1,5 +1,7 @@
-#ifndef __FMOPL_H_
-#define __FMOPL_H_
+#pragma once
+
+#ifndef __FMOPL_H__
+#define __FMOPL_H__
 
 /* --- select emulation chips --- */
 #define BUILD_YM3812 (HAS_YM3812)
@@ -18,7 +20,7 @@ typedef unsigned int	UINT32;  /* unsigned 32bit */
 typedef signed char		INT8;    /* signed  8bit   */
 typedef signed short	INT16;   /* signed 16bit   */
 typedef signed int		INT32;   /* signed 32bit   */
-#endif
+#endif /* __OSDCOMM_H__ */
 
 typedef stream_sample_t OPLSAMPLE;
 /*
@@ -39,19 +41,19 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(void *param);
 
 #if BUILD_YM3812
 
-void *YM3812Init(int sndindex, UINT32 clock, UINT32 rate);
-void YM3812Shutdown(void *chip);
-void YM3812ResetChip(void *chip);
-int  YM3812Write(void *chip, int a, int v);
-unsigned char YM3812Read(void *chip, int a);
-int  YM3812TimerOver(void *chip, int c);
-void YM3812UpdateOne(void *chip, OPLSAMPLE *buffer, int length);
+void *ym3812_init(int sndindex, UINT32 clock, UINT32 rate);
+void ym3812_shutdown(void *chip);
+void ym3812_reset_chip(void *chip);
+int  ym3812_write(void *chip, int a, int v);
+unsigned char ym3812_read(void *chip, int a);
+int  ym3812_timer_over(void *chip, int c);
+void ym3812_update_one(void *chip, OPLSAMPLE *buffer, int length);
 
-void YM3812SetTimerHandler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
-void YM3812SetIRQHandler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
-void YM3812SetUpdateHandler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
+void ym3812_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
+void ym3812_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
+void ym3812_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
 
-#endif
+#endif /* BUILD_YM3812 */
 
 
 #if BUILD_YM3526
@@ -63,13 +65,13 @@ void YM3812SetUpdateHandler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *p
 ** 'clock' is the chip clock in Hz
 ** 'rate' is sampling rate
 */
-void *YM3526Init(int sndindex, UINT32 clock, UINT32 rate);
+void *ym3526_init(int sndindex, UINT32 clock, UINT32 rate);
 /* shutdown the YM3526 emulators*/
-void YM3526Shutdown(void *chip);
-void YM3526ResetChip(void *chip);
-int  YM3526Write(void *chip, int a, int v);
-unsigned char YM3526Read(void *chip, int a);
-int  YM3526TimerOver(void *chip, int c);
+void ym3526_shutdown(void *chip);
+void ym3526_reset_chip(void *chip);
+int  ym3526_write(void *chip, int a, int v);
+unsigned char ym3526_read(void *chip, int a);
+int  ym3526_timer_over(void *chip, int c);
 /*
 ** Generate samples for one of the YM3526's
 **
@@ -77,35 +79,35 @@ int  YM3526TimerOver(void *chip, int c);
 ** '*buffer' is the output buffer pointer
 ** 'length' is the number of samples that should be generated
 */
-void YM3526UpdateOne(void *chip, OPLSAMPLE *buffer, int length);
+void ym3526_update_one(void *chip, OPLSAMPLE *buffer, int length);
 
-void YM3526SetTimerHandler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
-void YM3526SetIRQHandler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
-void YM3526SetUpdateHandler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
+void ym3526_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
+void ym3526_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
+void ym3526_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
 
-#endif
+#endif /* BUILD_YM3526 */
 
 
 #if BUILD_Y8950
 
 /* Y8950 port handlers */
-void Y8950SetPortHandler(void *chip, OPL_PORTHANDLER_W PortHandler_w, OPL_PORTHANDLER_R PortHandler_r, void *param);
-void Y8950SetKeyboardHandler(void *chip, OPL_PORTHANDLER_W KeyboardHandler_w, OPL_PORTHANDLER_R KeyboardHandler_r, void *param);
-void Y8950SetDeltaTMemory(void *chip, void * deltat_mem_ptr, int deltat_mem_size );
+void y8950_set_port_handler(void *chip, OPL_PORTHANDLER_W PortHandler_w, OPL_PORTHANDLER_R PortHandler_r, void *param);
+void y8950_set_keyboard_handler(void *chip, OPL_PORTHANDLER_W KeyboardHandler_w, OPL_PORTHANDLER_R KeyboardHandler_r, void *param);
+void y8950_set_delta_t_memory(void *chip, void * deltat_mem_ptr, int deltat_mem_size );
 
-void * Y8950Init (int sndindex, UINT32 clock, UINT32 rate);
-void Y8950Shutdown (void *chip);
-void Y8950ResetChip (void *chip);
-int  Y8950Write (void *chip, int a, int v);
-unsigned char Y8950Read (void *chip, int a);
-int  Y8950TimerOver (void *chip, int c);
-void Y8950UpdateOne (void *chip, OPLSAMPLE *buffer, int length);
+void * y8950_init(int sndindex, UINT32 clock, UINT32 rate);
+void y8950_shutdown(void *chip);
+void y8950_reset_chip(void *chip);
+int  y8950_write(void *chip, int a, int v);
+unsigned char y8950_read (void *chip, int a);
+int  y8950_timer_over(void *chip, int c);
+void y8950_update_one(void *chip, OPLSAMPLE *buffer, int length);
 
-void Y8950SetTimerHandler (void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
-void Y8950SetIRQHandler (void *chip, OPL_IRQHANDLER IRQHandler, void *param);
-void Y8950SetUpdateHandler (void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
+void y8950_set_timer_handler(void *chip, OPL_TIMERHANDLER TimerHandler, void *param);
+void y8950_set_irq_handler(void *chip, OPL_IRQHANDLER IRQHandler, void *param);
+void y8950_set_update_handler(void *chip, OPL_UPDATEHANDLER UpdateHandler, void *param);
 
-#endif
+#endif /* BUILD_Y8950 */
 
 
-#endif /* __FMOPL_H_ */
+#endif /* __FMOPL_H__ */
diff --git a/src/emu/sound/gaelco.h b/src/emu/sound/gaelco.h
index d8799d36027..ff06ddc59fb 100644
--- a/src/emu/sound/gaelco.h
+++ b/src/emu/sound/gaelco.h
@@ -1,5 +1,7 @@
-#ifndef gaelco_snd_h
-#define gaelco_snd_h
+#pragma once
+
+#ifndef __GALELCO_H__
+#define __GALELCO_H__
 
 typedef struct _gaelcosnd_interface gaelcosnd_interface;
 struct _gaelcosnd_interface
@@ -13,4 +15,4 @@ extern UINT16 *gaelco_sndregs;
 WRITE16_HANDLER( gaelcosnd_w );
 READ16_HANDLER( gaelcosnd_r );
 
-#endif
+#endif /* __GALELCO_H__ */
diff --git a/src/emu/sound/hc55516.h b/src/emu/sound/hc55516.h
index 924f8a229dc..0139f6aa46d 100644
--- a/src/emu/sound/hc55516.h
+++ b/src/emu/sound/hc55516.h
@@ -1,5 +1,7 @@
-#ifndef HC55516_H
-#define HC55516_H
+#pragma once
+
+#ifndef __HC55516_H__
+#define __HC55516_H__
 
 
 /* sets the digit (0 or 1) */
@@ -33,4 +35,4 @@ WRITE8_HANDLER( hc55516_1_digit_clock_clear_w );
 READ8_HANDLER ( hc55516_1_clock_state_r );
 
 
-#endif
+#endif /* __HC55516_H__ */
diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h
index 782d15ccc39..cfb1b6224de 100644
--- a/src/emu/sound/ics2115.h
+++ b/src/emu/sound/ics2115.h
@@ -1,3 +1,5 @@
+#pragma once
+
 #ifndef __ICS2115_H__
 #define __ICS2115_H__
 
@@ -9,4 +11,4 @@ struct _ics2115_interface {
 READ8_HANDLER( ics2115_r );
 WRITE8_HANDLER( ics2115_w );
 
-#endif
+#endif /* __ICS2115_H__ */
diff --git a/src/emu/sound/iremga20.c b/src/emu/sound/iremga20.c
index 2cfb7d104fa..8717fe34a3b 100644
--- a/src/emu/sound/iremga20.c
+++ b/src/emu/sound/iremga20.c
@@ -132,7 +132,7 @@ static void IremGA20_update( void *param, stream_sample_t **inputs, stream_sampl
 	}
 }
 
-WRITE16_HANDLER( IremGA20_w )
+WRITE16_HANDLER( irem_ga20_w )
 {
 	struct IremGA20_chip_def *chip = sndti_token(SOUND_IREMGA20, 0);
 	int channel;
@@ -183,7 +183,7 @@ WRITE16_HANDLER( IremGA20_w )
 	}
 }
 
-READ16_HANDLER( IremGA20_r )
+READ16_HANDLER( irem_ga20_r )
 {
 	struct IremGA20_chip_def *chip = sndti_token(SOUND_IREMGA20, 0);
 	int channel;
diff --git a/src/emu/sound/iremga20.h b/src/emu/sound/iremga20.h
index aa187b88521..809afb6722f 100644
--- a/src/emu/sound/iremga20.h
+++ b/src/emu/sound/iremga20.h
@@ -3,10 +3,12 @@
     Irem GA20 PCM Sound Chip
 
 *********************************************************/
+#pragma once
+
 #ifndef __IREMGA20_H__
 #define __IREMGA20_H__
 
-WRITE16_HANDLER( IremGA20_w );
-READ16_HANDLER( IremGA20_r );
+WRITE16_HANDLER( irem_ga20_w );
+READ16_HANDLER( irem_ga20_r );
 
 #endif /* __IREMGA20_H__ */
diff --git a/src/emu/sound/k005289.h b/src/emu/sound/k005289.h
index d0e2b00c249..d3f89776b3c 100644
--- a/src/emu/sound/k005289.h
+++ b/src/emu/sound/k005289.h
@@ -1,5 +1,7 @@
-#ifndef k005289_h
-#define k005289_h
+#pragma once
+
+#ifndef __K005289_H__
+#define __K005289_H__
 
 WRITE8_HANDLER( k005289_control_A_w );
 WRITE8_HANDLER( k005289_control_B_w );
@@ -8,4 +10,4 @@ WRITE8_HANDLER( k005289_pitch_B_w );
 WRITE8_HANDLER( k005289_keylatch_A_w );
 WRITE8_HANDLER( k005289_keylatch_B_w );
 
-#endif
+#endif /* __K005289_H__ */
diff --git a/src/emu/sound/tiaintf.h b/src/emu/sound/tiaintf.h
index e7d404faedc..cc9d66173c3 100644
--- a/src/emu/sound/tiaintf.h
+++ b/src/emu/sound/tiaintf.h
@@ -1,8 +1,8 @@
-#ifndef TIA_H
-#define TIA_H
+#pragma once
+
+#ifndef __TIAINTF_H__
+#define __TIAINTF_H__
 
 WRITE8_HANDLER( tia_sound_w );
 
-#endif
-
-
+#endif /* __TIAINTF_H__ */
diff --git a/src/emu/sound/tiasound.h b/src/emu/sound/tiasound.h
index 25205864d38..69796c45bc6 100644
--- a/src/emu/sound/tiasound.h
+++ b/src/emu/sound/tiasound.h
@@ -32,13 +32,15 @@
 /* bear this legend.                                                         */
 /*                                                                           */
 /*****************************************************************************/
-#ifndef TIASOUND_H
-#define TIASOUND_H
+#pragma once
+
+#ifndef __TIASOUND_H__
+#define __TIASOUND_H__
 
 void *tia_sound_init(int clock, int sample_rate, int gain);
 void tia_sound_free(void *chip);
 void tia_process (void *chip, stream_sample_t *buffer, int length);
 void tia_write(void *chip, offs_t offset, UINT8 data);
 
-#endif	/* TIASOUND_H */
+#endif	/* __TIASOUND_H__ */
 
diff --git a/src/emu/sound/tms3615.h b/src/emu/sound/tms3615.h
index 49062f1997c..844b88b4efe 100644
--- a/src/emu/sound/tms3615.h
+++ b/src/emu/sound/tms3615.h
@@ -1,9 +1,11 @@
-#ifndef TMS3615_SOUND_H
-#define TMS3615_SOUND_H
+#pragma once
+
+#ifndef __TMS3615_H__
+#define __TMS3615_H__
 
 extern void tms3615_enable_w(int chip, int enable);
 
 #define TMS3615_FOOTAGE_8	0
 #define TMS3615_FOOTAGE_16	1
 
-#endif
+#endif /* __TMS3615_H__ */
diff --git a/src/emu/sound/tms36xx.c b/src/emu/sound/tms36xx.c
index 2f5b0306887..9b93ea6069f 100644
--- a/src/emu/sound/tms36xx.c
+++ b/src/emu/sound/tms36xx.c
@@ -40,7 +40,7 @@ struct TMS36XX {
 	int tune_ofs;		/* note currently playing */
 	int tune_max;		/* end of tune */
 
-	const struct TMS36XXinterface *intf;
+	const tms36xx_interface *intf;
 };
 
 #define C(n)	(int)((FSCALE<<(n-1))*1.18921)	/* 2^(3/12) */
diff --git a/src/emu/sound/tms36xx.h b/src/emu/sound/tms36xx.h
index 45a4fa887d9..ccdfdb136f2 100644
--- a/src/emu/sound/tms36xx.h
+++ b/src/emu/sound/tms36xx.h
@@ -1,5 +1,7 @@
-#ifndef TMS36XX_SOUND_H
-#define TMS36XX_SOUND_H
+#pragma once
+
+#ifndef __TMS36XX_H__
+#define __TMS36XX_H__
 
 /* subtypes */
 #define MM6221AA    21      /* Phoenix (fixed melodies) */
@@ -7,7 +9,9 @@
 #define TMS3617 	17		/* Monster Bash (13 notes, six outputs) */
 
 /* The interface structure */
-struct TMS36XXinterface {
+typedef struct _tms36xx_interface tms36xx_interface;
+struct _tms36xx_interface
+{
 	int subtype;
 	double decay[6];	/* decay times for the six harmonic notes */
 	double speed;		/* tune speed (meaningful for the TMS3615 only) */
@@ -22,4 +26,4 @@ extern void tms36xx_note_w(int chip, int octave, int note);
 /* TMS3617 interface functions */
 extern void tms3617_enable_w(int chip, int enable);
 
-#endif
+#endif /* __TMS36XX_H__ */
diff --git a/src/emu/sound/tms5110.h b/src/emu/sound/tms5110.h
index d31862e4a30..91eb4c3c2cb 100644
--- a/src/emu/sound/tms5110.h
+++ b/src/emu/sound/tms5110.h
@@ -1,5 +1,7 @@
-#ifndef tms5110_h
-#define tms5110_h
+#pragma once
+
+#ifndef __TMS5110_H__
+#define __TMS5110_H__
 
 
 /* TMS5110 commands */
@@ -42,5 +44,4 @@ int tms5110_ready_read(void *chip);
 
 void tms5110_process(void *chip, INT16 *buffer, unsigned int size);
 
-#endif
-
+#endif /* __TMS5110_H__ */
diff --git a/src/emu/sound/tms5220.h b/src/emu/sound/tms5220.h
index f192bf40010..a358697077b 100644
--- a/src/emu/sound/tms5220.h
+++ b/src/emu/sound/tms5220.h
@@ -1,5 +1,7 @@
-#ifndef tms5220_h
-#define tms5220_h
+#pragma once
+
+#ifndef __TMS5220_H__
+#define __TMS5220_H__
 
 void *tms5220_create(int index);
 void tms5220_destroy(void *chip);
@@ -21,14 +23,13 @@ void tms5220_set_load_address(void *chip, void (*func)(int));
 void tms5220_set_read_and_branch(void *chip, void (*func)(void));
 
 
-
-typedef enum
+enum _tms5220_variant
 {
 	variant_tms5220,	/* TMS5220_IS_TMS5220, TMS5220_IS_TMS5220C,  TMS5220_IS_TSP5220C */
 	variant_tmc0285		/* TMS5220_IS_TMS5200, TMS5220_IS_CD2501 */
-} tms5220_variant;
+};
+typedef enum _tms5220_variant tms5220_variant;
 
 void tms5220_set_variant(void *chip, tms5220_variant new_variant);
 
-#endif
-
+#endif /* __TMS5220_H__ */
diff --git a/src/emu/sound/upd7759.c b/src/emu/sound/upd7759.c
index a49488a7b23..a0c0bff5b52 100644
--- a/src/emu/sound/upd7759.c
+++ b/src/emu/sound/upd7759.c
@@ -622,8 +622,8 @@ static void register_for_save(struct upd7759_chip *chip, int index)
 
 static void *upd7759_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct upd7759_interface defintrf = { 0 };
-	const struct upd7759_interface *intf = (config != NULL) ? config : &defintrf;
+	static const upd7759_interface defintrf = { 0 };
+	const upd7759_interface *intf = (config != NULL) ? config : &defintrf;
 	struct upd7759_chip *chip;
 
 	chip = auto_malloc(sizeof(*chip));
diff --git a/src/emu/sound/upd7759.h b/src/emu/sound/upd7759.h
index d86f655289a..92808ed5d5d 100644
--- a/src/emu/sound/upd7759.h
+++ b/src/emu/sound/upd7759.h
@@ -1,5 +1,7 @@
-#ifndef UPD7759S_H
-#define UPD7759S_H
+#pragma once
+
+#ifndef __UPD7759_H__
+#define __UPD7759_H__
 
 /* There are two modes for the uPD7759, selected through the !MD pin.
    This is the mode select input.  High is stand alone, low is slave.
@@ -8,7 +10,8 @@
 
 #define UPD7759_STANDARD_CLOCK		640000
 
-struct upd7759_interface
+typedef struct _upd7759_interface upd7759_interface;
+struct _upd7759_interface
 {
 	void (*drqcallback)(int param);	/* drq callback (per chip, slave mode only) */
 };
@@ -26,5 +29,4 @@ WRITE8_HANDLER( upd7759_0_port_w );
 WRITE8_HANDLER( upd7759_0_start_w );
 READ8_HANDLER( upd7759_0_busy_r );
 
-#endif
-
+#endif /* __UPD7759_H__ */
diff --git a/src/emu/sound/vlm5030.c b/src/emu/sound/vlm5030.c
index 50d4db5952f..b67563dbbf5 100644
--- a/src/emu/sound/vlm5030.c
+++ b/src/emu/sound/vlm5030.c
@@ -89,7 +89,7 @@ chirp 12-..: vokume   0   : silent
 
 struct vlm5030_info
 {
-	const struct VLM5030interface *intf;
+	const vlm5030_interface *intf;
 
 	sound_stream * channel;
 
@@ -516,14 +516,14 @@ static void VLM5030_reset(struct vlm5030_info *chip)
 }
 
 /* set speech rom address */
-void VLM5030_set_rom(void *speech_rom)
+void vlm5030_set_rom(void *speech_rom)
 {
 	struct vlm5030_info *chip = sndti_token(SOUND_VLM5030, 0);
 	chip->rom = (UINT8 *)speech_rom;
 }
 
 /* get BSY pin level */
-int VLM5030_BSY(void)
+int vlm5030_bsy(void)
 {
 	struct vlm5030_info *chip = sndti_token(SOUND_VLM5030, 0);
 	VLM5030_update(chip);
@@ -531,14 +531,14 @@ int VLM5030_BSY(void)
 }
 
 /* latch contoll data */
-WRITE8_HANDLER( VLM5030_data_w )
+WRITE8_HANDLER( vlm5030_data_w )
 {
 	struct vlm5030_info *chip = sndti_token(SOUND_VLM5030, 0);
 	chip->latch_data = (UINT8)data;
 }
 
 /* set RST pin level : reset / set table address A8-A15 */
-void VLM5030_RST (int pin )
+void vlm5030_rst (int pin )
 {
 	struct vlm5030_info *chip = sndti_token(SOUND_VLM5030, 0);
 	if( chip->pin_RST )
@@ -563,7 +563,7 @@ void VLM5030_RST (int pin )
 }
 
 /* set VCU pin level : ?? unknown */
-void VLM5030_VCU(int pin)
+void vlm5030_vcu(int pin)
 {
 	struct vlm5030_info *chip = sndti_token(SOUND_VLM5030, 0);
 	/* direct mode / indirect mode */
@@ -572,7 +572,7 @@ void VLM5030_VCU(int pin)
 }
 
 /* set ST pin level  : set table address A0-A7 / start speech */
-void VLM5030_ST(int pin )
+void vlm5030_st(int pin )
 {
 	struct vlm5030_info *chip = sndti_token(SOUND_VLM5030, 0);
 	int table;
@@ -633,7 +633,7 @@ if( chip->interp_step != 1)
 /* speech_rom == 0 -> use sampling data mode */
 static void *vlm5030_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	const struct VLM5030interface defintrf = { 0 };
+	const vlm5030_interface defintrf = { 0 };
 	int emulation_rate;
 	struct vlm5030_info *chip;
 
@@ -660,7 +660,7 @@ static void *vlm5030_start(const char *tag, int sndindex, int clock, const void
 
 	chip->channel = stream_create(0, 1, emulation_rate,chip,vlm5030_update_callback);
 
-	/* don't restore "UINT8 *chip->rom" when use VLM5030_set_rom() */
+	/* don't restore "UINT8 *chip->rom" when use vlm5030_set_rom() */
 
 	state_save_register_item(VLM_NAME,sndindex,chip->address);
 	state_save_register_item(VLM_NAME,sndindex,chip->pin_BSY);
diff --git a/src/emu/sound/vlm5030.h b/src/emu/sound/vlm5030.h
index c5e3ccb6101..c1203b2cb82 100644
--- a/src/emu/sound/vlm5030.h
+++ b/src/emu/sound/vlm5030.h
@@ -1,24 +1,26 @@
-#ifndef VLM5030_h
-#define VLM5030_h
+#pragma once
 
-struct VLM5030interface
+#ifndef __VLM5030_H__
+#define __VLM5030_H__
+
+typedef struct _vlm5030_interface vlm5030_interface;
+struct _vlm5030_interface
 {
 	int memory_size;    /* memory size of speech rom (0=memory region length) */
 };
 
 /* set speech rom address */
-void VLM5030_set_rom(void *speech_rom);
+void vlm5030_set_rom(void *speech_rom);
 
 /* get BSY pin level */
-int VLM5030_BSY(void);
+int vlm5030_bsy(void);
 /* latch contoll data */
-WRITE8_HANDLER( VLM5030_data_w );
+WRITE8_HANDLER( vlm5030_data_w );
 /* set RST pin level : reset / set table address A8-A15 */
-void VLM5030_RST (int pin );
+void vlm5030_rst (int pin );
 /* set VCU pin level : ?? unknown */
-void VLM5030_VCU(int pin );
+void vlm5030_vcu(int pin );
 /* set ST pin level  : set table address A0-A7 / start speech */
-void VLM5030_ST(int pin );
-
-#endif
+void vlm5030_st(int pin );
 
+#endif /* __VLM5030_H__ */
diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c
index 57b37589cc8..cd0cf94dd70 100644
--- a/src/emu/sound/vrender0.c
+++ b/src/emu/sound/vrender0.c
@@ -19,7 +19,7 @@ struct _VR0Chip
 	UINT32 *TexBase;
 	UINT32 *FBBase;
 	UINT32 SOUNDREGS[0x10000/4];
-	struct VR0Interface Intf;
+	vr0_interface Intf;
 	sound_stream * stream;
 };
 
@@ -78,8 +78,8 @@ static const unsigned short ULawTo16[]=
 #define ENVVOL(chan)	(VR0->SOUNDREGS[(0x20/4)*chan+0x04/4]&0xffffff)
 
 /*
-#define GETSOUNDREG16(Chan,Offs) program_read_word_32le(VR0->Intf.RegBase+0x20*Chan+Offs)
-#define GETSOUNDREG32(Chan,Offs) program_read_dword_32le(VR0->Intf.RegBase+0x20*Chan+Offs)
+#define GETSOUNDREG16(Chan,Offs) program_read_word_32le(VR0->Intf.reg_base+0x20*Chan+Offs)
+#define GETSOUNDREG32(Chan,Offs) program_read_dword_32le(VR0->Intf.reg_base+0x20*Chan+Offs)
 
 #define CURSADDR(chan)  GETSOUNDREG32(chan,0x00)
 #define DSADDR(chan)    GETSOUNDREG16(chan,0x08)
@@ -87,16 +87,16 @@ static const unsigned short ULawTo16[]=
 #define LOOPEND(chan)   (GETSOUNDREG32(chan,0x10)&0x3fffff)
 #define ENVVOL(chan)    (GETSOUNDREG32(chan,0x04)&0xffffff)
 */
-void VR0_Snd_Set_Areas(UINT32 *Texture,UINT32 *Frame)
+void vr0_snd_set_areas(UINT32 *texture,UINT32 *frame)
 {
 	struct _VR0Chip *VR0 = sndti_token(SOUND_VRENDER0, 0);
-	VR0->TexBase=Texture;
-	VR0->FBBase=Frame;
+	VR0->TexBase=texture;
+	VR0->FBBase=frame;
 }
 
 static void *vrender0_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	const struct VR0Interface *intf;
+	const vr0_interface *intf;
 	struct _VR0Chip *VR0;
 
 	VR0 = auto_malloc(sizeof(*VR0));
@@ -104,7 +104,7 @@ static void *vrender0_start(const char *tag, int sndindex, int clock, const void
 
 	intf=config;
 
-	memcpy(&(VR0->Intf),intf,sizeof(struct VR0Interface));
+	memcpy(&(VR0->Intf),intf,sizeof(vr0_interface));
 	memset(VR0->SOUNDREGS,0,0x10000);
 
 	VR0->stream = stream_create(0, 2, 44100, VR0, VR0_Update);
@@ -112,7 +112,7 @@ static void *vrender0_start(const char *tag, int sndindex, int clock, const void
 	return VR0;
 }
 
-WRITE32_HANDLER(VR0_Snd_Write)
+WRITE32_HANDLER(vr0_snd_write)
 {
 	struct _VR0Chip *VR0 = sndti_token(SOUND_VRENDER0, 0);
 	if(offset==0x404/4)
@@ -137,7 +137,7 @@ WRITE32_HANDLER(VR0_Snd_Write)
 }
 
 
-READ32_HANDLER(VR0_Snd_Read)
+READ32_HANDLER(vr0_snd_read)
 {
 	struct _VR0Chip *VR0 = sndti_token(SOUND_VRENDER0, 0);
 	return VR0->SOUNDREGS[offset];
diff --git a/src/emu/sound/vrender0.h b/src/emu/sound/vrender0.h
index 7f0e8ed1317..3dfd9cbe009 100644
--- a/src/emu/sound/vrender0.h
+++ b/src/emu/sound/vrender0.h
@@ -1,9 +1,18 @@
-struct VR0Interface
+#pragma once
+
+#ifndef __VRENDER0_H__
+#define __VRENDER0_H__
+
+
+typedef struct _vr0_interface vr0_interface;
+struct _vr0_interface
 {
 	UINT32 RegBase;
 };
 
-void VR0_Snd_Set_Areas(UINT32 *Texture,UINT32 *Frame);
+void vr0_snd_set_areas(UINT32 *texture,UINT32 *frame);
 
-READ32_HANDLER(VR0_Snd_Read);
-WRITE32_HANDLER(VR0_Snd_Write);
+READ32_HANDLER(vr0_snd_read);
+WRITE32_HANDLER(vr0_snd_write);
+
+#endif /* __VRENDER0_H__ */
diff --git a/src/emu/sound/wave.h b/src/emu/sound/wave.h
index 6f630a696b1..f12c5d9524c 100644
--- a/src/emu/sound/wave.h
+++ b/src/emu/sound/wave.h
@@ -1,5 +1,7 @@
-#ifndef WAVE_H
-#define WAVE_H
+#pragma once
+
+#ifndef __WAVE_H__
+#define __WAVE_H__
 
 /*****************************************************************************
  *  CassetteWave interface
@@ -11,6 +13,4 @@
 
 
 
-#endif /* WAVE_H */
-
-
+#endif /* __WAVE_H__ */
diff --git a/src/emu/sound/wavwrite.h b/src/emu/sound/wavwrite.h
index 6a41fd9924b..a1f21a8237d 100644
--- a/src/emu/sound/wavwrite.h
+++ b/src/emu/sound/wavwrite.h
@@ -1,5 +1,7 @@
-#ifndef WAVWRITE_H
-#define WAVWRITE_H
+#pragma once
+
+#ifndef __WAVWRITE_H__
+#define __WAVWRITE_H__
 
 typedef struct _wav_file wav_file;
 
@@ -11,4 +13,4 @@ void wav_add_data_32(wav_file *wavptr, INT32 *data, int samples, int shift);
 void wav_add_data_16lr(wav_file *wavptr, INT16 *left, INT16 *right, int samples);
 void wav_add_data_32lr(wav_file *wavptr, INT32 *left, INT32 *right, int samples, int shift);
 
-#endif /* WAVWRITE_H */
+#endif /* __WAVWRITE_H__ */
diff --git a/src/emu/sound/x1_010.c b/src/emu/sound/x1_010.c
index 9ef2347c432..e0d44ae2614 100644
--- a/src/emu/sound/x1_010.c
+++ b/src/emu/sound/x1_010.c
@@ -195,7 +195,7 @@ static void seta_update( void *param, stream_sample_t **inputs, stream_sample_t
 static void *x1_010_start(const char *tag, int sndindex, int clock, const void *config)
 {
 	int i;
-	const struct x1_010_interface *intf = config;
+	const x1_010_interface *intf = config;
 	struct x1_010_info *info;
 
 	info = auto_malloc(sizeof(*info));
diff --git a/src/emu/sound/x1_010.h b/src/emu/sound/x1_010.h
index d54d22cc3f8..776c8e410c4 100644
--- a/src/emu/sound/x1_010.h
+++ b/src/emu/sound/x1_010.h
@@ -1,4 +1,11 @@
-struct x1_010_interface
+#pragma once
+
+#ifndef __X1_010_H__
+#define __X1_010_H__
+
+
+typedef struct _x1_010_interface x1_010_interface;
+struct _x1_010_interface
 {
 	int adr;	/* address */
 };
@@ -11,3 +18,5 @@ READ16_HANDLER ( seta_sound_word_r );
 WRITE16_HANDLER( seta_sound_word_w );
 
 void seta_sound_enable_w(int);
+
+#endif /* __X1_010_H__ */
diff --git a/src/emu/sound/ym2151.c b/src/emu/sound/ym2151.c
index a109a42874a..fe9519aa07d 100644
--- a/src/emu/sound/ym2151.c
+++ b/src/emu/sound/ym2151.c
@@ -1042,7 +1042,7 @@ INLINE void refresh_EG(YM2151Operator * op)
 
 
 /* write a register on YM2151 chip number 'n' */
-void YM2151WriteReg(void *_chip, int r, int v)
+void ym2151_write_reg(void *_chip, int r, int v)
 {
 	YM2151 *chip = _chip;
 	YM2151Operator *op = &chip->oper[ (r&0x07)*4+((r&0x18)>>3) ];
@@ -1366,7 +1366,7 @@ static TIMER_CALLBACK( cymfile_callback )
 }
 
 
-int YM2151ReadStatus( void *_chip )
+int ym2151_read_status( void *_chip )
 {
 	YM2151 *chip = _chip;
 	return chip->status;
@@ -1379,7 +1379,7 @@ int YM2151ReadStatus( void *_chip )
 /*
 *   state save support for MAME
 */
-STATE_POSTLOAD( YM2151Postload )
+STATE_POSTLOAD( ym2151_postload )
 {
 	YM2151 *YM2151_chip = (YM2151 *)param;
 	int j;
@@ -1487,10 +1487,10 @@ static void ym2151_state_save_register( YM2151 *chip, int sndindex )
 
 	state_save_register_item_array(buf1, sndindex, chip->connect);
 
-	state_save_register_postload(Machine, YM2151Postload, chip);
+	state_save_register_postload(Machine, ym2151_postload, chip);
 }
 #else
-STATE_POSTLOAD( YM2151Postload )
+STATE_POSTLOAD( ym2151_postload )
 {
 }
 
@@ -1507,7 +1507,7 @@ static void ym2151_state_save_register( YM2151 *chip, int sndindex )
 *   'clock' is the chip clock in Hz
 *   'rate' is sampling rate
 */
-void * YM2151Init(int index, int clock, int rate)
+void * ym2151_init(int index, int clock, int rate)
 {
 	YM2151 *PSG;
 
@@ -1535,14 +1535,14 @@ void * YM2151Init(int index, int clock, int rate)
 	/*logerror("YM2151[init] eg_timer_add=%8x eg_timer_overflow=%8x\n", PSG->eg_timer_add, PSG->eg_timer_overflow);*/
 
 #ifdef USE_MAME_TIMERS
-/* this must be done _before_ a call to YM2151ResetChip() */
+/* this must be done _before_ a call to ym2151_reset_chip() */
 	PSG->timer_A = timer_alloc(timer_callback_a, PSG);
 	PSG->timer_B = timer_alloc(timer_callback_b, PSG);
 #else
 	PSG->tim_A      = 0;
 	PSG->tim_B      = 0;
 #endif
-	YM2151ResetChip(PSG);
+	ym2151_reset_chip(PSG);
 	/*logerror("YM2151[init] clock=%i sampfreq=%i\n", PSG->clock, PSG->sampfreq);*/
 
 	if (LOG_CYM_FILE)
@@ -1559,7 +1559,7 @@ void * YM2151Init(int index, int clock, int rate)
 
 
 
-void YM2151Shutdown(void *_chip)
+void ym2151_shutdown(void *_chip)
 {
 	YM2151 *chip = _chip;
 
@@ -1589,7 +1589,7 @@ void YM2151Shutdown(void *_chip)
 /*
 *   Reset chip number 'n'.
 */
-void YM2151ResetChip(void *_chip)
+void ym2151_reset_chip(void *_chip)
 {
 	int i;
 	YM2151 *chip = _chip;
@@ -1641,11 +1641,11 @@ void YM2151ResetChip(void *_chip)
 	chip->csm_req	= 0;
 	chip->status    = 0;
 
-	YM2151WriteReg(chip, 0x1b, 0);	/* only because of CT1, CT2 output pins */
-	YM2151WriteReg(chip, 0x18, 0);	/* set LFO frequency */
+	ym2151_write_reg(chip, 0x1b, 0);	/* only because of CT1, CT2 output pins */
+	ym2151_write_reg(chip, 0x18, 0);	/* set LFO frequency */
 	for (i=0x20; i<0x100; i++)		/* set the operators */
 	{
-		YM2151WriteReg(chip, i, 0);
+		ym2151_write_reg(chip, i, 0);
 	}
 }
 
@@ -2372,7 +2372,7 @@ INLINE signed int acc_calc(signed int value)
 *   '**buffers' is table of pointers to the buffers: left and right
 *   'length' is the number of samples that should be generated
 */
-void YM2151UpdateOne(void *chip, SAMP **buffers, int length)
+void ym2151_update_one(void *chip, SAMP **buffers, int length)
 {
 	int i;
 	signed int outl,outr;
@@ -2485,13 +2485,13 @@ void YM2151UpdateOne(void *chip, SAMP **buffers, int length)
 	}
 }
 
-void YM2151SetIrqHandler(void *chip, void(*handler)(running_machine *machine, int irq))
+void ym2151_set_irq_handler(void *chip, void(*handler)(running_machine *machine, int irq))
 {
 	YM2151 *PSG = chip;
 	PSG->irqhandler = handler;
 }
 
-void YM2151SetPortWriteHandler(void *chip, write8_machine_func handler)
+void ym2151_set_port_write_handler(void *chip, write8_machine_func handler)
 {
 	YM2151 *PSG = chip;
 	PSG->porthandler = handler;
diff --git a/src/emu/sound/ym2151.h b/src/emu/sound/ym2151.h
index e8cdc55ea07..710e4f935c4 100644
--- a/src/emu/sound/ym2151.h
+++ b/src/emu/sound/ym2151.h
@@ -1,5 +1,4 @@
 /*
-**
 ** File: ym2151.h - header file for software implementation of YM2151
 **                                            FM Operator Type-M(OPM)
 **
@@ -29,8 +28,11 @@
 ** Ishmair - for the datasheet and motivation.
 */
 
-#ifndef _H_YM2151_
-#define _H_YM2151_
+#pragma once
+
+#ifndef __YM2151_H__
+#define __YM2151_H__
+
 
 /* 16- and 8-bit samples (signed) are supported*/
 #define SAMPLE_BITS 16
@@ -52,13 +54,13 @@ typedef stream_sample_t SAMP;
 ** 'clock' is the chip clock in Hz
 ** 'rate' is sampling rate
 */
-void *YM2151Init(int index, int clock, int rate);
+void *ym2151_init(int index, int clock, int rate);
 
 /* shutdown the YM2151 emulators*/
-void YM2151Shutdown(void *chip);
+void ym2151_shutdown(void *chip);
 
 /* reset all chip registers for YM2151 number 'num'*/
-void YM2151ResetChip(void *chip);
+void ym2151_reset_chip(void *chip);
 
 /*
 ** Generate samples for one of the YM2151's
@@ -67,20 +69,21 @@ void YM2151ResetChip(void *chip);
 ** '**buffers' is table of pointers to the buffers: left and right
 ** 'length' is the number of samples that should be generated
 */
-void YM2151UpdateOne(void *chip, SAMP **buffers, int length);
+void ym2151_update_one(void *chip, SAMP **buffers, int length);
 
 /* write 'v' to register 'r' on YM2151 chip number 'n'*/
-void YM2151WriteReg(void *chip, int r, int v);
+void ym2151_write_reg(void *chip, int r, int v);
 
 /* read status register on YM2151 chip number 'n'*/
-int YM2151ReadStatus(void *chip);
+int ym2151_read_status(void *chip);
 
 /* set interrupt handler on YM2151 chip number 'n'*/
-void YM2151SetIrqHandler(void *chip, void (*handler)(running_machine *machine, int irq));
+void ym2151_set_irq_handler(void *chip, void (*handler)(running_machine *machine, int irq));
 
 /* set port write handler on YM2151 chip number 'n'*/
-void YM2151SetPortWriteHandler(void *chip, write8_machine_func handler);
+void ym2151_set_port_write_handler(void *chip, write8_machine_func handler);
 
 /* refresh chip when load state */
-STATE_POSTLOAD( YM2151Postload );
-#endif /*_H_YM2151_*/
+STATE_POSTLOAD( ym2151_postload );
+
+#endif /*__YM2151_H__*/
diff --git a/src/emu/sound/ym2413.c b/src/emu/sound/ym2413.c
index 0e8a296fe68..d5dcaea6fd8 100644
--- a/src/emu/sound/ym2413.c
+++ b/src/emu/sound/ym2413.c
@@ -2082,13 +2082,13 @@ static unsigned char OPLLRead(YM2413 *chip,int a)
 
 
 
-void * YM2413Init(int clock, int rate, int index)
+void * ym2413_init(int clock, int rate, int index)
 {
 	/* emulator create */
 	return OPLLCreate(clock, rate, index);
 }
 
-void YM2413Shutdown(void *chip)
+void ym2413_shutdown(void *chip)
 {
 	YM2413 *OPLL = chip;
 
@@ -2096,25 +2096,25 @@ void YM2413Shutdown(void *chip)
 	OPLLDestroy(OPLL);
 }
 
-void YM2413ResetChip(void *chip)
+void ym2413_reset_chip(void *chip)
 {
 	YM2413 *OPLL = chip;
 	OPLLResetChip(OPLL);
 }
 
-void YM2413Write(void *chip, int a, int v)
+void ym2413_write(void *chip, int a, int v)
 {
 	YM2413 *OPLL = chip;
 	OPLLWrite(OPLL, a, v);
 }
 
-unsigned char YM2413Read(void *chip, int a)
+unsigned char ym2413_read(void *chip, int a)
 {
 	YM2413 *OPLL = chip;
 	return OPLLRead(OPLL, a) & 0x03 ;
 }
 
-void YM2413SetUpdateHandler(void *chip,OPLL_UPDATEHANDLER UpdateHandler,void *param)
+void ym2413_set_update_handler(void *chip,OPLL_UPDATEHANDLER UpdateHandler,void *param)
 {
 	YM2413 *OPLL = chip;
 	OPLLSetUpdateHandler(OPLL, UpdateHandler, param);
@@ -2128,7 +2128,7 @@ void YM2413SetUpdateHandler(void *chip,OPLL_UPDATEHANDLER UpdateHandler,void *pa
 ** '*buffer' is the output buffer pointer
 ** 'length' is the number of samples that should be generated
 */
-void YM2413UpdateOne(void *_chip, SAMP **buffers, int length)
+void ym2413_update_one(void *_chip, SAMP **buffers, int length)
 {
 	YM2413		*chip  = _chip;
 	UINT8		rhythm = chip->rhythm&0x20;
diff --git a/src/emu/sound/ym2413.h b/src/emu/sound/ym2413.h
index 72bc5e11347..28ae32545a5 100644
--- a/src/emu/sound/ym2413.h
+++ b/src/emu/sound/ym2413.h
@@ -1,5 +1,7 @@
-#ifndef _H_YM2413_
-#define _H_YM2413_
+#pragma once
+
+#ifndef __YM2413_H__
+#define __YM2413_H__
 
 /* select output bits size of output : 8 or 16 */
 #define SAMPLE_BITS 16
@@ -27,16 +29,15 @@ typedef INT8 SAMP;
 
 
 
-void *YM2413Init(int clock, int rate, int index);
-void YM2413Shutdown(void *chip);
-void YM2413ResetChip(void *chip);
-void YM2413Write(void *chip, int a, int v);
-unsigned char YM2413Read(void *chip, int a);
-void YM2413UpdateOne(void *chip, SAMP **buffers, int length);
+void *ym2413_init(int clock, int rate, int index);
+void ym2413_shutdown(void *chip);
+void ym2413_reset_chip(void *chip);
+void ym2413_write(void *chip, int a, int v);
+unsigned char ym2413_read(void *chip, int a);
+void ym2413_update_one(void *chip, SAMP **buffers, int length);
 
 typedef void (*OPLL_UPDATEHANDLER)(void *param,int min_interval_us);
 
-void YM2413SetUpdateHandler(void *chip, OPLL_UPDATEHANDLER UpdateHandler, void *param);
+void ym2413_set_update_handler(void *chip, OPLL_UPDATEHANDLER UpdateHandler, void *param);
 
-
-#endif /*_H_YM2413_*/
+#endif /*__YM2413_H__*/
diff --git a/src/emu/sound/ymdeltat.h b/src/emu/sound/ymdeltat.h
index 15c626e3e13..45c00bd48f8 100644
--- a/src/emu/sound/ymdeltat.h
+++ b/src/emu/sound/ymdeltat.h
@@ -1,5 +1,7 @@
-#ifndef __YMDELTAT_H_
-#define __YMDELTAT_H_
+#pragma once
+
+#ifndef __YMDELTAT_H__
+#define __YMDELTAT_H__
 
 #define YM_DELTAT_SHIFT    (16)
 
@@ -21,7 +23,7 @@ typedef struct deltat_adpcm_state {     /* AT: rearranged and tigntened structur
 	double	read_time;		/* Y8950: 8 cycles of main clock;  YM2608: 18 cycles of main clock */
 #endif
 	UINT32	memory_size;
-	int	output_range;
+	int		output_range;
 	UINT32	now_addr;		/* current address      */
 	UINT32	now_step;		/* currect step         */
 	UINT32	step;			/* step                 */
@@ -79,4 +81,4 @@ void YM_DELTAT_ADPCM_CALC(YM_DELTAT *DELTAT);
 void YM_DELTAT_postload(YM_DELTAT *DELTAT,UINT8 *regs);
 void YM_DELTAT_savestate(const char *statename,int num,YM_DELTAT *DELTAT);
 
-#endif
+#endif /* __YMDELTAT_H__ */
diff --git a/src/emu/sound/ymf262.c b/src/emu/sound/ymf262.c
index 6e4312900f8..1db1d03929d 100644
--- a/src/emu/sound/ymf262.c
+++ b/src/emu/sound/ymf262.c
@@ -2464,26 +2464,26 @@ static int OPL3TimerOver(OPL3 *chip,int c)
 
 
 
-void * YMF262Init(int clock, int rate)
+void * ymf262_init(int clock, int rate)
 {
 	return OPL3Create(OPL3_TYPE_YMF262,clock,rate);
 }
 
-void YMF262Shutdown(void *chip)
+void ymf262_shutdown(void *chip)
 {
 	OPL3Destroy(chip);
 }
-void YMF262ResetChip(void *chip)
+void ymf262_reset_chip(void *chip)
 {
 	OPL3ResetChip(chip);
 }
 
-int YMF262Write(void *chip, int a, int v)
+int ymf262_write(void *chip, int a, int v)
 {
 	return OPL3Write(chip, a, v);
 }
 
-unsigned char YMF262Read(void *chip, int a)
+unsigned char ymf262_read(void *chip, int a)
 {
 	/* Note on status register: */
 
@@ -2496,20 +2496,20 @@ unsigned char YMF262Read(void *chip, int a)
 
 	return OPL3Read(chip, a);
 }
-int YMF262TimerOver(void *chip, int c)
+int ymf262_timer_over(void *chip, int c)
 {
 	return OPL3TimerOver(chip, c);
 }
 
-void YMF262SetTimerHandler(void *chip, OPL3_TIMERHANDLER timer_handler, void *param)
+void ymf262_set_timer_handler(void *chip, OPL3_TIMERHANDLER timer_handler, void *param)
 {
 	OPL3SetTimerHandler(chip, timer_handler, param);
 }
-void YMF262SetIRQHandler(void *chip,OPL3_IRQHANDLER IRQHandler,void *param)
+void ymf262_set_irq_handler(void *chip,OPL3_IRQHANDLER IRQHandler,void *param)
 {
 	OPL3SetIRQHandler(chip, IRQHandler, param);
 }
-void YMF262SetUpdateHandler(void *chip,OPL3_UPDATEHANDLER UpdateHandler,void *param)
+void ymf262_set_update_handler(void *chip,OPL3_UPDATEHANDLER UpdateHandler,void *param)
 {
 	OPL3SetUpdateHandler(chip, UpdateHandler, param);
 }
@@ -2522,7 +2522,7 @@ void YMF262SetUpdateHandler(void *chip,OPL3_UPDATEHANDLER UpdateHandler,void *pa
 ** '**buffers' is table of 4 pointers to the buffers: CH.A, CH.B, CH.C and CH.D
 ** 'length' is the number of samples that should be generated
 */
-void YMF262UpdateOne(void *_chip, OPL3SAMPLE **buffers, int length)
+void ymf262_update_one(void *_chip, OPL3SAMPLE **buffers, int length)
 {
 	OPL3		*chip  = _chip;
 	UINT8		rhythm = chip->rhythm&0x20;
diff --git a/src/emu/sound/ymf262.h b/src/emu/sound/ymf262.h
index 63ef5bba561..e60a87d7092 100644
--- a/src/emu/sound/ymf262.h
+++ b/src/emu/sound/ymf262.h
@@ -1,5 +1,7 @@
-#ifndef YMF262_H
-#define YMF262_H
+#pragma once
+
+#ifndef __YMF262_H__
+#define __YMF262_H__
 
 /* select number of output bits: 8 or 16 */
 #define OPL3_SAMPLE_BITS 16
@@ -30,17 +32,17 @@ typedef void (*OPL3_IRQHANDLER)(void *param,int irq);
 typedef void (*OPL3_UPDATEHANDLER)(void *param,int min_interval_us);
 
 
-void *YMF262Init(int clock, int rate);
-void YMF262Shutdown(void *chip);
-void YMF262ResetChip(void *chip);
-int  YMF262Write(void *chip, int a, int v);
-unsigned char YMF262Read(void *chip, int a);
-int  YMF262TimerOver(void *chip, int c);
-void YMF262UpdateOne(void *chip, OPL3SAMPLE **buffers, int length);
+void *ymf262_init(int clock, int rate);
+void ymf262_shutdown(void *chip);
+void ymf262_reset_chip(void *chip);
+int  ymf262_write(void *chip, int a, int v);
+unsigned char ymf262_read(void *chip, int a);
+int  ymf262_timer_over(void *chip, int c);
+void ymf262_update_one(void *chip, OPL3SAMPLE **buffers, int length);
 
-void YMF262SetTimerHandler(void *chip, OPL3_TIMERHANDLER TimerHandler, void *param);
-void YMF262SetIRQHandler(void *chip, OPL3_IRQHANDLER IRQHandler, void *param);
-void YMF262SetUpdateHandler(void *chip, OPL3_UPDATEHANDLER UpdateHandler, void *param);
+void ymf262_set_timer_handler(void *chip, OPL3_TIMERHANDLER TimerHandler, void *param);
+void ymf262_set_irq_handler(void *chip, OPL3_IRQHANDLER IRQHandler, void *param);
+void ymf262_set_update_handler(void *chip, OPL3_UPDATEHANDLER UpdateHandler, void *param);
 
 
-#endif /* YMF262_H */
+#endif /* __YMF262_H__ */
diff --git a/src/emu/sound/ymf271.c b/src/emu/sound/ymf271.c
index 462d327b7cb..5e3e7e7d7ce 100644
--- a/src/emu/sound/ymf271.c
+++ b/src/emu/sound/ymf271.c
@@ -1744,8 +1744,8 @@ static void ymf271_init(YMF271Chip *chip, UINT8 *rom, void (*cb)(running_machine
 
 static void *ymf271_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YMF271interface defintrf = { 0 };
-	const struct YMF271interface *intf;
+	static const ymf271_interface defintrf = { 0 };
+	const ymf271_interface *intf;
 	int i;
 	YMF271Chip *chip;
 
@@ -1777,22 +1777,22 @@ static void *ymf271_start(const char *tag, int sndindex, int clock, const void *
 	return chip;
 }
 
-READ8_HANDLER( YMF271_0_r )
+READ8_HANDLER( ymf271_0_r )
 {
 	return ymf271_r(0, offset);
 }
 
-WRITE8_HANDLER( YMF271_0_w )
+WRITE8_HANDLER( ymf271_0_w )
 {
 	ymf271_w(0, offset, data);
 }
 
-READ8_HANDLER( YMF271_1_r )
+READ8_HANDLER( ymf271_1_r )
 {
 	return ymf271_r(1, offset);
 }
 
-WRITE8_HANDLER( YMF271_1_w )
+WRITE8_HANDLER( ymf271_1_w )
 {
 	ymf271_w(1, offset, data);
 }
diff --git a/src/emu/sound/ymf271.h b/src/emu/sound/ymf271.h
index fc6ad5c882f..db355e9e480 100644
--- a/src/emu/sound/ymf271.h
+++ b/src/emu/sound/ymf271.h
@@ -1,16 +1,19 @@
-#ifndef _YMF271_H_
-#define _YMF271_H_
+#pragma once
 
-struct YMF271interface
+#ifndef __YMF271_H__
+#define __YMF271_H__
+
+typedef struct _ymf271_interface ymf271_interface;
+struct _ymf271_interface
 {
 	read8_machine_func ext_read;		/* external memory read */
 	write8_machine_func ext_write;	/* external memory write */
 	void (*irq_callback)(running_machine *machine, int state);	/* irq callback */
 };
 
-READ8_HANDLER( YMF271_0_r );
-WRITE8_HANDLER( YMF271_0_w );
-READ8_HANDLER( YMF271_1_r );
-WRITE8_HANDLER( YMF271_1_w );
+READ8_HANDLER( ymf271_0_r );
+WRITE8_HANDLER( ymf271_0_w );
+READ8_HANDLER( ymf271_1_r );
+WRITE8_HANDLER( ymf271_1_w );
 
-#endif
+#endif /* __YMF271_H__ */
diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c
index 8a6323b9646..afd86386a98 100644
--- a/src/emu/sound/ymf278b.c
+++ b/src/emu/sound/ymf278b.c
@@ -669,8 +669,8 @@ static void ymf278b_init(YMF278BChip *chip, UINT8 *rom, void (*cb)(running_machi
 
 static void *ymf278b_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YMF278B_interface defintrf = { 0 };
-	const struct YMF278B_interface *intf;
+	static const ymf278b_interface defintrf = { 0 };
+	const ymf278b_interface *intf;
 	int i;
 	YMF278BChip *chip;
 
@@ -705,83 +705,83 @@ static void *ymf278b_start(const char *tag, int sndindex, int clock, const void
 }
 
 
-READ8_HANDLER( YMF278B_status_port_0_r )
+READ8_HANDLER( ymf278b_status_port_0_r )
 {
 	return ymf278b_status_port_r(0);
 }
 
-READ8_HANDLER( YMF278B_data_port_0_r )
+READ8_HANDLER( ymf278b_data_port_0_r )
 {
 	return ymf278b_data_port_r(0);
 }
 
-WRITE8_HANDLER( YMF278B_control_port_0_A_w )
+WRITE8_HANDLER( ymf278b_control_port_0_a_w )
 {
 	ymf278b_control_port_A_w(0, data);
 }
 
-WRITE8_HANDLER( YMF278B_data_port_0_A_w )
+WRITE8_HANDLER( ymf278b_data_port_0_a_w )
 {
 	ymf278b_data_port_A_w(machine, 0, data);
 }
 
-WRITE8_HANDLER( YMF278B_control_port_0_B_w )
+WRITE8_HANDLER( ymf278b_control_port_0_b_w )
 {
 	ymf278b_control_port_B_w(0, data);
 }
 
-WRITE8_HANDLER( YMF278B_data_port_0_B_w )
+WRITE8_HANDLER( ymf278b_data_port_0_b_w )
 {
 	ymf278b_data_port_B_w(0, data);
 }
 
-WRITE8_HANDLER( YMF278B_control_port_0_C_w )
+WRITE8_HANDLER( ymf278b_control_port_0_c_w )
 {
 	ymf278b_control_port_C_w(0, data);
 }
 
-WRITE8_HANDLER( YMF278B_data_port_0_C_w )
+WRITE8_HANDLER( ymf278b_data_port_0_c_w )
 {
 	ymf278b_data_port_C_w(0, data);
 }
 
 
-READ8_HANDLER( YMF278B_status_port_1_r )
+READ8_HANDLER( ymf278b_status_port_1_r )
 {
 	return ymf278b_status_port_r(1);
 }
 
-READ8_HANDLER( YMF278B_data_port_1_r )
+READ8_HANDLER( ymf278b_data_port_1_r )
 {
 	return ymf278b_data_port_r(1);
 }
 
-WRITE8_HANDLER( YMF278B_control_port_1_A_w )
+WRITE8_HANDLER( ymf278b_control_port_1_a_w )
 {
 	ymf278b_control_port_A_w(1, data);
 }
 
-WRITE8_HANDLER( YMF278B_data_port_1_A_w )
+WRITE8_HANDLER( ymf278b_data_port_1_a_w )
 {
 	ymf278b_data_port_A_w(machine, 1, data);
 }
 
-WRITE8_HANDLER( YMF278B_control_port_1_B_w )
+WRITE8_HANDLER( ymf278b_control_port_1_b_w )
 {
 	ymf278b_control_port_B_w(1, data);
 }
 
-WRITE8_HANDLER( YMF278B_data_port_1_B_w )
+WRITE8_HANDLER( ymf278b_data_port_1_b_w )
 {
 	ymf278b_data_port_B_w(1, data);
 }
 
-WRITE8_HANDLER( YMF278B_control_port_1_C_w )
+WRITE8_HANDLER( ymf278b_control_port_1_c_w )
 {
 	ymf278b_control_port_C_w(1, data);
 }
 
-WRITE8_HANDLER( YMF278B_data_port_1_C_w )
+WRITE8_HANDLER( ymf278b_data_port_1_c_w )
 {
 	ymf278b_data_port_C_w(1, data);
 }
diff --git a/src/emu/sound/ymf278b.h b/src/emu/sound/ymf278b.h
index a7a1d6269e5..7e06b0a70aa 100644
--- a/src/emu/sound/ymf278b.h
+++ b/src/emu/sound/ymf278b.h
@@ -1,28 +1,33 @@
+#pragma once
+
 #ifndef __YMF278B_H__
 #define __YMF278B_H__
 
 #define YMF278B_STD_CLOCK (33868800)			/* standard clock for OPL4 */
 
-struct YMF278B_interface {
+
+typedef struct _ymf278b_interface ymf278b_interface;
+struct _ymf278b_interface
+{
 	void (*irq_callback)(running_machine *machine, int state);	/* irq callback */
 };
 
-READ8_HANDLER( YMF278B_status_port_0_r );
-READ8_HANDLER( YMF278B_data_port_0_r );
-WRITE8_HANDLER( YMF278B_control_port_0_A_w );
-WRITE8_HANDLER( YMF278B_data_port_0_A_w );
-WRITE8_HANDLER( YMF278B_control_port_0_B_w );
-WRITE8_HANDLER( YMF278B_data_port_0_B_w );
-WRITE8_HANDLER( YMF278B_control_port_0_C_w );
-WRITE8_HANDLER( YMF278B_data_port_0_C_w );
+READ8_HANDLER( ymf278b_status_port_0_r );
+READ8_HANDLER( ymf278b_data_port_0_r );
+WRITE8_HANDLER( ymf278b_control_port_0_a_w );
+WRITE8_HANDLER( ymf278b_data_port_0_a_w );
+WRITE8_HANDLER( ymf278b_control_port_0_b_w );
+WRITE8_HANDLER( ymf278b_data_port_0_b_w );
+WRITE8_HANDLER( ymf278b_control_port_0_c_w );
+WRITE8_HANDLER( ymf278b_data_port_0_c_w );
 
-READ8_HANDLER( YMF278B_status_port_1_r );
-READ8_HANDLER( YMF278B_data_port_1_r );
-WRITE8_HANDLER( YMF278B_control_port_1_A_w );
-WRITE8_HANDLER( YMF278B_data_port_1_A_w );
-WRITE8_HANDLER( YMF278B_control_port_1_B_w );
-WRITE8_HANDLER( YMF278B_data_port_1_B_w );
-WRITE8_HANDLER( YMF278B_control_port_1_C_w );
-WRITE8_HANDLER( YMF278B_data_port_1_C_w );
+READ8_HANDLER( ymf278b_status_port_1_r );
+READ8_HANDLER( ymf278b_data_port_1_r );
+WRITE8_HANDLER( ymf278b_control_port_1_a_w );
+WRITE8_HANDLER( ymf278b_data_port_1_a_w );
+WRITE8_HANDLER( ymf278b_control_port_1_b_w );
+WRITE8_HANDLER( ymf278b_data_port_1_b_w );
+WRITE8_HANDLER( ymf278b_control_port_1_c_w );
+WRITE8_HANDLER( ymf278b_data_port_1_c_w );
 
-#endif
+#endif /* __YMF278B_H__ */
diff --git a/src/emu/sound/ymz280b.c b/src/emu/sound/ymz280b.c
index 6e6d1805e05..3b97ac0fd39 100644
--- a/src/emu/sound/ymz280b.c
+++ b/src/emu/sound/ymz280b.c
@@ -629,8 +629,8 @@ static void ymz280b_update(void *param, stream_sample_t **inputs, stream_sample_
 
 static void *ymz280b_start(const char *tag, int sndindex, int clock, const void *config)
 {
-	static const struct YMZ280Binterface defintrf = { 0 };
-	const struct YMZ280Binterface *intf = (config != NULL) ? config : &defintrf;
+	static const ymz280b_interface defintrf = { 0 };
+	const ymz280b_interface *intf = (config != NULL) ? config : &defintrf;
 	struct YMZ280BChip *chip;
 
 	chip = auto_malloc(sizeof(*chip));
@@ -942,41 +942,41 @@ static int compute_status(struct YMZ280BChip *chip)
 
 /**********************************************************************************************
 
-     YMZ280B_status_0_r/YMZ280B_status_1_r -- handle a read from the status register
+     ymz280b_status_0_r/ymz280b_status_1_r -- handle a read from the status register
 
 ***********************************************************************************************/
 
-READ8_HANDLER( YMZ280B_status_0_r )
+READ8_HANDLER( ymz280b_status_0_r )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	return compute_status(chip);
 }
 
-READ8_HANDLER( YMZ280B_status_1_r )
+READ8_HANDLER( ymz280b_status_1_r )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	return compute_status(chip);
 }
 
-READ16_HANDLER( YMZ280B_status_0_lsb_r )
+READ16_HANDLER( ymz280b_status_0_lsb_r )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	return compute_status(chip);
 }
 
-READ16_HANDLER( YMZ280B_status_0_msb_r )
+READ16_HANDLER( ymz280b_status_0_msb_r )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	return compute_status(chip) << 8;
 }
 
-READ16_HANDLER( YMZ280B_status_1_lsb_r )
+READ16_HANDLER( ymz280b_status_1_lsb_r )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	return compute_status(chip);
 }
 
-READ16_HANDLER( YMZ280B_status_1_msb_r )
+READ16_HANDLER( ymz280b_status_1_msb_r )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	return compute_status(chip) << 8;
@@ -984,41 +984,41 @@ READ16_HANDLER( YMZ280B_status_1_msb_r )
 
 /**********************************************************************************************
 
-     YMZ280B_register_0_w/YMZ280B_register_1_w -- handle a write to the register select
+     ymz280b_register_0_w/ymz280b_register_1_w -- handle a write to the register select
 
 ***********************************************************************************************/
 
-WRITE8_HANDLER( YMZ280B_register_0_w )
+WRITE8_HANDLER( ymz280b_register_0_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	chip->current_register = data;
 }
 
-WRITE8_HANDLER( YMZ280B_register_1_w )
+WRITE8_HANDLER( ymz280b_register_1_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	chip->current_register = data;
 }
 
-WRITE16_HANDLER( YMZ280B_register_0_lsb_w )
+WRITE16_HANDLER( ymz280b_register_0_lsb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	if (ACCESSING_BITS_0_7)	chip->current_register = data & 0xff;
 }
 
-WRITE16_HANDLER( YMZ280B_register_0_msb_w )
+WRITE16_HANDLER( ymz280b_register_0_msb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	if (ACCESSING_BITS_8_15)	chip->current_register = (data >> 8) & 0xff;
 }
 
-WRITE16_HANDLER( YMZ280B_register_1_lsb_w )
+WRITE16_HANDLER( ymz280b_register_1_lsb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	if (ACCESSING_BITS_0_7)	chip->current_register = data & 0xff;
 }
 
-WRITE16_HANDLER( YMZ280B_register_1_msb_w )
+WRITE16_HANDLER( ymz280b_register_1_msb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	if (ACCESSING_BITS_8_15)	chip->current_register = (data >> 8) & 0xff;
@@ -1026,41 +1026,41 @@ WRITE16_HANDLER( YMZ280B_register_1_msb_w )
 
 /**********************************************************************************************
 
-     YMZ280B_data_0_w/YMZ280B_data_1_w -- handle a write to the current register
+     ymz280b_data_0_w/ymz280b_data_1_w -- handle a write to the current register
 
 ***********************************************************************************************/
 
-WRITE8_HANDLER( YMZ280B_data_0_w )
+WRITE8_HANDLER( ymz280b_data_0_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	write_to_register(chip, data);
 }
 
-WRITE8_HANDLER( YMZ280B_data_1_w )
+WRITE8_HANDLER( ymz280b_data_1_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	write_to_register(chip, data);
 }
 
-WRITE16_HANDLER( YMZ280B_data_0_lsb_w )
+WRITE16_HANDLER( ymz280b_data_0_lsb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	if (ACCESSING_BITS_0_7)	write_to_register(chip, data & 0xff);
 }
 
-WRITE16_HANDLER( YMZ280B_data_0_msb_w )
+WRITE16_HANDLER( ymz280b_data_0_msb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
 	if (ACCESSING_BITS_8_15)	write_to_register(chip, (data >> 8) & 0xff);
 }
 
-WRITE16_HANDLER( YMZ280B_data_1_lsb_w )
+WRITE16_HANDLER( ymz280b_data_1_lsb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	if (ACCESSING_BITS_0_7)	write_to_register(chip, data & 0xff);
 }
 
-WRITE16_HANDLER( YMZ280B_data_1_msb_w )
+WRITE16_HANDLER( ymz280b_data_1_msb_w )
 {
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
 	if (ACCESSING_BITS_8_15)	write_to_register(chip, (data >> 8) & 0xff);
@@ -1068,11 +1068,11 @@ WRITE16_HANDLER( YMZ280B_data_1_msb_w )
 
 /**********************************************************************************************
 
-     YMZ280B_data_0_r/YMZ280B_data_1_r -- handle an external RAM read
+     ymz280b_data_0_r/ymz280b_data_1_r -- handle an external RAM read
 
 ***********************************************************************************************/
 
-READ8_HANDLER( YMZ280B_data_0_r )
+READ8_HANDLER( ymz280b_data_0_r )
 {
 	UINT8 data;
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 0);
@@ -1081,7 +1081,7 @@ READ8_HANDLER( YMZ280B_data_0_r )
 	return data;
 }
 
-READ8_HANDLER( YMZ280B_data_1_r )
+READ8_HANDLER( ymz280b_data_1_r )
 {
 	UINT8 data;
 	struct YMZ280BChip *chip = sndti_token(SOUND_YMZ280B, 1);
diff --git a/src/emu/sound/ymz280b.h b/src/emu/sound/ymz280b.h
index 4355fab2d55..22592910132 100644
--- a/src/emu/sound/ymz280b.h
+++ b/src/emu/sound/ymz280b.h
@@ -5,38 +5,42 @@
  *
  **********************************************************************************************/
 
-#ifndef YMZ280B_H
-#define YMZ280B_H
+#pragma once
 
-struct YMZ280Binterface
+#ifndef __YMZ280B_H__
+#define __YMZ280B_H__
+
+
+typedef struct _ymz280b_interface ymz280b_interface;
+struct _ymz280b_interface
 {
 	void (*irq_callback)(running_machine *machine, int state);	/* irq callback */
 	read8_machine_func ext_read;			/* external RAM read */
 	write8_machine_func ext_write;		/* external RAM write */
 };
 
-READ8_HANDLER ( YMZ280B_status_0_r );
-WRITE8_HANDLER( YMZ280B_register_0_w );
-READ8_HANDLER( YMZ280B_data_0_r );
-WRITE8_HANDLER( YMZ280B_data_0_w );
+READ8_HANDLER ( ymz280b_status_0_r );
+WRITE8_HANDLER( ymz280b_register_0_w );
+READ8_HANDLER( ymz280b_data_0_r );
+WRITE8_HANDLER( ymz280b_data_0_w );
 
-READ16_HANDLER ( YMZ280B_status_0_lsb_r );
-READ16_HANDLER ( YMZ280B_status_0_msb_r );
-WRITE16_HANDLER( YMZ280B_register_0_lsb_w );
-WRITE16_HANDLER( YMZ280B_register_0_msb_w );
-WRITE16_HANDLER( YMZ280B_data_0_lsb_w );
-WRITE16_HANDLER( YMZ280B_data_0_msb_w );
+READ16_HANDLER ( ymz280b_status_0_lsb_r );
+READ16_HANDLER ( ymz280b_status_0_msb_r );
+WRITE16_HANDLER( ymz280b_register_0_lsb_w );
+WRITE16_HANDLER( ymz280b_register_0_msb_w );
+WRITE16_HANDLER( ymz280b_data_0_lsb_w );
+WRITE16_HANDLER( ymz280b_data_0_msb_w );
 
-READ8_HANDLER ( YMZ280B_status_1_r );
-WRITE8_HANDLER( YMZ280B_register_1_w );
-READ8_HANDLER( YMZ280B_data_1_r );
-WRITE8_HANDLER( YMZ280B_data_1_w );
+READ8_HANDLER ( ymz280b_status_1_r );
+WRITE8_HANDLER( ymz280b_register_1_w );
+READ8_HANDLER( ymz280b_data_1_r );
+WRITE8_HANDLER( ymz280b_data_1_w );
 
-READ16_HANDLER ( YMZ280B_status_1_lsb_r );
-READ16_HANDLER ( YMZ280B_status_1_msb_r );
-WRITE16_HANDLER( YMZ280B_register_1_lsb_w );
-WRITE16_HANDLER( YMZ280B_register_1_msb_w );
-WRITE16_HANDLER( YMZ280B_data_1_lsb_w );
-WRITE16_HANDLER( YMZ280B_data_1_msb_w );
+READ16_HANDLER ( ymz280b_status_1_lsb_r );
+READ16_HANDLER ( ymz280b_status_1_msb_r );
+WRITE16_HANDLER( ymz280b_register_1_lsb_w );
+WRITE16_HANDLER( ymz280b_register_1_msb_w );
+WRITE16_HANDLER( ymz280b_data_1_lsb_w );
+WRITE16_HANDLER( ymz280b_data_1_msb_w );
 
-#endif
+#endif /* __YMZ280B_H__ */
diff --git a/src/mame/audio/atarijsa.c b/src/mame/audio/atarijsa.c
index 0e2164f7f68..97dbeae389c 100644
--- a/src/mame/audio/atarijsa.c
+++ b/src/mame/audio/atarijsa.c
@@ -740,9 +740,9 @@ static void update_all_volumes(running_machine *machine )
 
 static ADDRESS_MAP_START( atarijsa1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0x2000, 0x2001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa1_io_r, jsa1_io_w)
 	AM_RANGE(0x3000, 0xffff) AM_ROM
 ADDRESS_MAP_END
@@ -750,9 +750,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( atarijsa2_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0x2000, 0x2001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x2800, 0x2bff) AM_READWRITE(jsa2_io_r, jsa2_io_w)
 	AM_RANGE(0x3000, 0xffff) AM_ROM
 ADDRESS_MAP_END
@@ -761,9 +761,9 @@ ADDRESS_MAP_END
 /* full map verified from schematics and Batman GALs */
 static ADDRESS_MAP_START( atarijsa3_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07fe) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x07fe) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07fe) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x07fe) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3_io_r, jsa3_io_w)
 	AM_RANGE(0x3000, 0xffff) AM_ROM
 ADDRESS_MAP_END
@@ -771,9 +771,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( atarijsa3s_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07fe) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x07fe) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x07fe) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x07fe) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2001) AM_MIRROR(0x07fe) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x2800, 0x2fff) AM_READWRITE(jsa3s_io_r, jsa3s_io_w)
 	AM_RANGE(0x3000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/audio/carnival.c b/src/mame/audio/carnival.c
index a68100db874..6b5fceb345c 100644
--- a/src/mame/audio/carnival.c
+++ b/src/mame/audio/carnival.c
@@ -273,11 +273,11 @@ static WRITE8_HANDLER( carnival_music_port_2_w )
 			break;
 
 		case PSG_BC_WRITE:
-			AY8910_write_port_0_w( machine, 0, psgData );
+			ay8910_write_port_0_w( machine, 0, psgData );
 			break;
 
 		case PSG_BC_LATCH_ADDRESS:
-			AY8910_control_port_0_w( machine, 0, psgData );
+			ay8910_control_port_0_w( machine, 0, psgData );
 			break;
 		}
 	}
diff --git a/src/mame/audio/cchasm.c b/src/mame/audio/cchasm.c
index 8ca2ff5b107..5cf4e2a637d 100644
--- a/src/mame/audio/cchasm.c
+++ b/src/mame/audio/cchasm.c
@@ -26,10 +26,10 @@ READ8_HANDLER( cchasm_snd_io_r )
         return sound_flags | coin;
 
     case 0x01:
-        return AY8910_read_port_0_r (machine, offset);
+        return ay8910_read_port_0_r (machine, offset);
 
     case 0x21:
-        return AY8910_read_port_1_r (machine, offset);
+        return ay8910_read_port_1_r (machine, offset);
 
     case 0x40:
         return soundlatch_r (machine, offset);
@@ -49,19 +49,19 @@ WRITE8_HANDLER( cchasm_snd_io_w )
     switch (offset & 0x61 )
     {
     case 0x00:
-        AY8910_control_port_0_w (machine, offset, data);
+        ay8910_control_port_0_w (machine, offset, data);
         break;
 
     case 0x01:
-        AY8910_write_port_0_w (machine, offset, data);
+        ay8910_write_port_0_w (machine, offset, data);
         break;
 
     case 0x20:
-        AY8910_control_port_1_w (machine, offset, data);
+        ay8910_control_port_1_w (machine, offset, data);
         break;
 
     case 0x21:
-        AY8910_write_port_1_w (machine, offset, data);
+        ay8910_write_port_1_w (machine, offset, data);
         break;
 
     case 0x40:
@@ -142,7 +142,7 @@ static WRITE8_HANDLER( ctc_timer_1_w )
     {
         output[0] ^= 0x7f;
         channel_active[0] = 1;
-        DAC_data_w(0, output[0]);
+        dac_data_w(0, output[0]);
     }
 }
 
@@ -152,7 +152,7 @@ static WRITE8_HANDLER( ctc_timer_2_w )
     {
         output[1] ^= 0x7f;
         channel_active[1] = 1;
-        DAC_data_w(1, output[0]);
+        dac_data_w(1, output[0]);
     }
 }
 
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 02c3afc5759..da34b1eec30 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -1528,15 +1528,15 @@ static MACHINE_RESET( demon_sound )
 static ADDRESS_MAP_START( demon_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x3000, 0x33ff) AM_RAM
-	AM_RANGE(0x4001, 0x4001) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x4002, 0x4002) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4003, 0x4003) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x5001, 0x5001) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0x5002, 0x5002) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x5003, 0x5003) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x6001, 0x6001) AM_READ(AY8910_read_port_2_r)
-	AM_RANGE(0x6002, 0x6002) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0x6003, 0x6003) AM_WRITE(AY8910_control_port_2_w)
+	AM_RANGE(0x4001, 0x4001) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x4002, 0x4002) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4003, 0x4003) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x5001, 0x5001) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0x5002, 0x5002) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x5003, 0x5003) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x6001, 0x6001) AM_READ(ay8910_read_port_2_r)
+	AM_RANGE(0x6002, 0x6002) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0x6003, 0x6003) AM_WRITE(ay8910_control_port_2_w)
 	AM_RANGE(0x7000, 0x7000) AM_WRITE(SMH_NOP)  /* watchdog? */
 ADDRESS_MAP_END
 
diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c
index 2820f8e3d33..6f586baba1d 100644
--- a/src/mame/audio/cyberbal.c
+++ b/src/mame/audio/cyberbal.c
@@ -155,7 +155,7 @@ WRITE16_HANDLER( cyberbal_sound_68k_w )
 
 WRITE16_HANDLER( cyberbal_sound_68k_dac_w )
 {
-	DAC_data_16_w((offset >> 3) & 1, (((data >> 3) & 0x800) | ((data >> 2) & 0x7ff)) << 4);
+	dac_data_16_w((offset >> 3) & 1, (((data >> 3) & 0x800) | ((data >> 2) & 0x7ff)) << 4);
 
 	if (fast_68k_int)
 	{
diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c
index 6c428a036f6..4071338d90b 100644
--- a/src/mame/audio/dkong.c
+++ b/src/mame/audio/dkong.c
@@ -1008,8 +1008,8 @@ static WRITE8_HANDLER( M58817_command_w )
 {
 	logerror("PA Write %x\n", data);
 
-	tms5110_CTL_w(machine, 0, data & 0x0f);
-	tms5110_PDC_w(machine, 0, (data>>4) & 0x01);
+	tms5110_ctl_w(machine, 0, data & 0x0f);
+	tms5110_pdc_w(machine, 0, (data>>4) & 0x01);
 	// FIXME 0x20 is CS
 }
 
diff --git a/src/mame/audio/gottlieb.c b/src/mame/audio/gottlieb.c
index 95aa96fa767..63937c25458 100644
--- a/src/mame/audio/gottlieb.c
+++ b/src/mame/audio/gottlieb.c
@@ -312,7 +312,7 @@ static ADDRESS_MAP_START( gottlieb_sound1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x0d80) AM_RAM
 	AM_RANGE(0x0200, 0x021f) AM_MIRROR(0x0de0) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w)
-	AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0fff) AM_WRITE(vortrax_data_w)
 	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0fff) AM_WRITE(speech_clock_dac_w)
 	AM_RANGE(0x6000, 0x7fff) AM_ROM
@@ -485,7 +485,7 @@ static WRITE8_HANDLER( dac_w )
 	/* dual DAC; the first DAC serves as the reference voltage for the
        second, effectively scaling the output */
 	dac_data[offset] = data;
-	DAC_data_16_w(0, dac_data[0] * dac_data[1]);
+	dac_data_16_w(0, dac_data[0] * dac_data[1]);
 }
 
 
@@ -507,17 +507,17 @@ static WRITE8_HANDLER( speech_control_w )
 		{
 			/* bit 4 goes to the 8913 BC1 pin */
 			if (data & 0x10)
-				AY8910_control_port_0_w(machine, 0, *psg_latch);
+				ay8910_control_port_0_w(machine, 0, *psg_latch);
 			else
-				AY8910_write_port_0_w(machine, 0, *psg_latch);
+				ay8910_write_port_0_w(machine, 0, *psg_latch);
 		}
 		else
 		{
 			/* bit 4 goes to the 8913 BC1 pin */
 			if (data & 0x10)
-				AY8910_control_port_1_w(machine, 0, *psg_latch);
+				ay8910_control_port_1_w(machine, 0, *psg_latch);
 			else
-				AY8910_write_port_1_w(machine, 0, *psg_latch);
+				ay8910_write_port_1_w(machine, 0, *psg_latch);
 		}
 	}
 
diff --git a/src/mame/audio/harddriv.c b/src/mame/audio/harddriv.c
index 4fec66a7a19..d3f4ec07247 100644
--- a/src/mame/audio/harddriv.c
+++ b/src/mame/audio/harddriv.c
@@ -334,7 +334,7 @@ WRITE16_HANDLER( hdsnddsp_dac_w )
 {
 	/* DAC L */
 	if (!dacmute)
-		DAC_signed_data_16_w(offset, data ^ 0x8000);
+		dac_signed_data_16_w(offset, data ^ 0x8000);
 }
 
 
diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c
index 7b07551f17c..77d64af5ca2 100644
--- a/src/mame/audio/irem.c
+++ b/src/mame/audio/irem.c
@@ -68,17 +68,17 @@ static WRITE8_HANDLER( m6803_port2_w )
 		{
 			/* PSG 0 or 1? */
 			if (port2 & 0x08)
-				AY8910_control_port_0_w(machine, 0, port1);
+				ay8910_control_port_0_w(machine, 0, port1);
 			if (port2 & 0x10)
-				AY8910_control_port_1_w(machine, 0, port1);
+				ay8910_control_port_1_w(machine, 0, port1);
 		}
 		else
 		{
 			/* PSG 0 or 1? */
 			if (port2 & 0x08)
-				AY8910_write_port_0_w(machine, 0, port1);
+				ay8910_write_port_0_w(machine, 0, port1);
 			if (port2 & 0x10)
-				AY8910_write_port_1_w(machine, 0, port1);
+				ay8910_write_port_1_w(machine, 0, port1);
 		}
 	}
 	port2 = data;
@@ -96,9 +96,9 @@ static READ8_HANDLER( m6803_port1_r )
 {
 	/* PSG 0 or 1? */
 	if (port2 & 0x08)
-		return AY8910_read_port_0_r(machine, 0);
+		return ay8910_read_port_0_r(machine, 0);
 	if (port2 & 0x10)
-		return AY8910_read_port_1_r(machine, 0);
+		return ay8910_read_port_1_r(machine, 0);
 	return 0xff;
 }
 
diff --git a/src/mame/audio/jaguar.c b/src/mame/audio/jaguar.c
index 52cea3038ee..bbb73d4978a 100644
--- a/src/mame/audio/jaguar.c
+++ b/src/mame/audio/jaguar.c
@@ -440,12 +440,12 @@ WRITE32_HANDLER( jaguar_serial_w )
 	{
 		/* right DAC */
 		case 2:
-			DAC_signed_data_16_w(1, (data & 0xffff) ^ 0x8000);
+			dac_signed_data_16_w(1, (data & 0xffff) ^ 0x8000);
 			break;
 
 		/* left DAC */
 		case 3:
-			DAC_signed_data_16_w(0, (data & 0xffff) ^ 0x8000);
+			dac_signed_data_16_w(0, (data & 0xffff) ^ 0x8000);
 			break;
 
 		/* frequency register */
diff --git a/src/mame/audio/leland.c b/src/mame/audio/leland.c
index 7a746fdfc63..a95a850d909 100644
--- a/src/mame/audio/leland.c
+++ b/src/mame/audio/leland.c
@@ -2008,7 +2008,7 @@ static READ16_HANDLER( peripheral_r )
 			if (!has_ym2151)
 				return pit8254_r(machine, offset | 0x40, mem_mask);
 			else
-				return YM2151_status_port_0_lsb_r(machine, offset, mem_mask);
+				return ym2151_status_port_0_lsb_r(machine, offset, mem_mask);
 
 		case 4:
 			if (is_redline)
@@ -2044,9 +2044,9 @@ static WRITE16_HANDLER( peripheral_w )
 			if (!has_ym2151)
 				pit8254_w(machine, offset | 0x40, data, mem_mask);
 			else if (offset == 0)
-				YM2151_register_port_0_lsb_w(machine, offset, data, mem_mask);
+				ym2151_register_port_0_lsb_w(machine, offset, data, mem_mask);
 			else if (offset == 1)
-				YM2151_data_port_0_lsb_w(machine, offset, data, mem_mask);
+				ym2151_data_port_0_lsb_w(machine, offset, data, mem_mask);
 			break;
 
 		case 4:
diff --git a/src/mame/audio/m72.c b/src/mame/audio/m72.c
index 52b6f6d04c1..b71de3ee337 100644
--- a/src/mame/audio/m72.c
+++ b/src/mame/audio/m72.c
@@ -203,6 +203,6 @@ READ8_HANDLER( m72_sample_r )
 
 WRITE8_HANDLER( m72_sample_w )
 {
-	DAC_signed_data_w(0,data);
+	dac_signed_data_w(0,data);
 	sample_addr = (sample_addr + 1) & (memory_region_length(machine, "samples") - 1);
 }
diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c
index 2f3e2cd52ab..048f241e069 100644
--- a/src/mame/audio/mario.c
+++ b/src/mame/audio/mario.c
@@ -418,8 +418,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( masao_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x2000, 0x23ff) AM_RAM
-	AM_RANGE(0x4000, 0x4000) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 /*************************************
diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c
index 483a35e74b3..99b244c8e2d 100644
--- a/src/mame/audio/mcr.c
+++ b/src/mame/audio/mcr.c
@@ -473,12 +473,12 @@ static ADDRESS_MAP_START( ssio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x0c00) AM_RAM
 	AM_RANGE(0x9000, 0x9003) AM_MIRROR(0x0ffc) AM_READ(ssio_data_r)
-	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x0ffc) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xb001, 0xb001) AM_MIRROR(0x0ffc) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0xb002, 0xb002) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0ffc) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x0ffc) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x0ffc) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xb000, 0xb000) AM_MIRROR(0x0ffc) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xb001, 0xb001) AM_MIRROR(0x0ffc) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0xb002, 0xb002) AM_MIRROR(0x0ffc) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xc000, 0xcfff) AM_READWRITE(SMH_NOP, ssio_status_w)
 	AM_RANGE(0xd000, 0xdfff) AM_WRITENOP	/* low bit controls yellow LED */
 	AM_RANGE(0xe000, 0xefff) AM_READ(ssio_irq_clear)
@@ -516,7 +516,7 @@ MACHINE_DRIVER_END
 static WRITE8_HANDLER( csdeluxe_porta_w )
 {
 	dacval = (dacval & ~0x3fc) | (data << 2);
-	DAC_signed_data_16_w(csdeluxe_dac_index, dacval << 6);
+	dac_signed_data_16_w(csdeluxe_dac_index, dacval << 6);
 }
 
 static WRITE8_HANDLER( csdeluxe_portb_w )
@@ -524,7 +524,7 @@ static WRITE8_HANDLER( csdeluxe_portb_w )
 	UINT8 z_mask = pia_get_port_b_z_mask(0);
 
 	dacval = (dacval & ~0x003) | (data >> 6);
-	DAC_signed_data_16_w(csdeluxe_dac_index, dacval << 6);
+	dac_signed_data_16_w(csdeluxe_dac_index, dacval << 6);
 
 	if (~z_mask & 0x10)  csdeluxe_status = (csdeluxe_status & ~1) | ((data >> 4) & 1);
 	if (~z_mask & 0x20)  csdeluxe_status = (csdeluxe_status & ~2) | ((data >> 4) & 2);
@@ -639,7 +639,7 @@ MACHINE_DRIVER_END
 static WRITE8_HANDLER( soundsgood_porta_w )
 {
 	dacval = (dacval & ~0x3fc) | (data << 2);
-	DAC_signed_data_16_w(soundsgood_dac_index, dacval << 6);
+	dac_signed_data_16_w(soundsgood_dac_index, dacval << 6);
 }
 
 static WRITE8_HANDLER( soundsgood_portb_w )
@@ -647,7 +647,7 @@ static WRITE8_HANDLER( soundsgood_portb_w )
 	UINT8 z_mask = pia_get_port_b_z_mask(1);
 
 	dacval = (dacval & ~0x003) | (data >> 6);
-	DAC_signed_data_16_w(soundsgood_dac_index, dacval << 6);
+	dac_signed_data_16_w(soundsgood_dac_index, dacval << 6);
 
 	if (~z_mask & 0x10)  soundsgood_status = (soundsgood_status & ~1) | ((data >> 4) & 1);
 	if (~z_mask & 0x20)  soundsgood_status = (soundsgood_status & ~2) | ((data >> 4) & 2);
@@ -737,13 +737,13 @@ MACHINE_DRIVER_END
 static WRITE8_HANDLER( turbocs_porta_w )
 {
 	dacval = (dacval & ~0x3fc) | (data << 2);
-	DAC_signed_data_16_w(turbocs_dac_index, dacval << 6);
+	dac_signed_data_16_w(turbocs_dac_index, dacval << 6);
 }
 
 static WRITE8_HANDLER( turbocs_portb_w )
 {
 	dacval = (dacval & ~0x003) | (data >> 6);
-	DAC_signed_data_16_w(turbocs_dac_index, dacval << 6);
+	dac_signed_data_16_w(turbocs_dac_index, dacval << 6);
 	turbocs_status = (data >> 4) & 3;
 }
 
diff --git a/src/mame/audio/meadows.c b/src/mame/audio/meadows.c
index 4ec8d9fa309..9e0b5a0b781 100644
--- a/src/mame/audio/meadows.c
+++ b/src/mame/audio/meadows.c
@@ -103,9 +103,9 @@ void meadows_sh_update(void)
 		dac_enable = meadows_0c03 & ENABLE_DAC;
 
 		if (dac_enable)
-			DAC_data_w(0, meadows_dac);
+			dac_data_w(0, meadows_dac);
 		else
-			DAC_data_w(0, 0);
+			dac_data_w(0, 0);
 	}
 
 	latched_0c01 = meadows_0c01;
@@ -120,9 +120,9 @@ void meadows_sh_dac_w(int data)
 {
 	meadows_dac = data;
 	if (dac_enable)
-		DAC_data_w(0, meadows_dac);
+		dac_data_w(0, meadows_dac);
 	else
-		DAC_data_w(0, 0);
+		dac_data_w(0, 0);
 }
 
 
diff --git a/src/mame/audio/n8080.c b/src/mame/audio/n8080.c
index 8b4d5b84014..8fbeb18d12b 100644
--- a/src/mame/audio/n8080.c
+++ b/src/mame/audio/n8080.c
@@ -408,13 +408,13 @@ static READ8_HANDLER( helifire_8035_p2_r )
 
 static WRITE8_HANDLER( n8080_dac_w )
 {
-	DAC_data_w(0, data & 0x80);
+	dac_data_w(0, data & 0x80);
 }
 
 
 static WRITE8_HANDLER( helifire_dac_w )
 {
-	DAC_data_w(0, data * helifire_dac_volume);
+	dac_data_w(0, data * helifire_dac_volume);
 }
 
 
diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c
index c14928a8908..0f68522b873 100644
--- a/src/mame/audio/redalert.c
+++ b/src/mame/audio/redalert.c
@@ -96,18 +96,18 @@ static WRITE8_HANDLER( redalert_AY8910_w )
 
 		/* BC1=1, BDIR=0 : read from PSG */
 		case 0x01:
-			ay8910_latch_1 = AY8910_read_port_0_r(machine, 0);
+			ay8910_latch_1 = ay8910_read_port_0_r(machine, 0);
 			break;
 
 		/* BC1=0, BDIR=1 : write to PSG */
 		case 0x02:
-			AY8910_write_port_0_w(machine, 0, ay8910_latch_2);
+			ay8910_write_port_0_w(machine, 0, ay8910_latch_2);
 			break;
 
 		/* BC1=1, BDIR=1 : latch address */
 		default:
 		case 0x03:
-			AY8910_control_port_0_w(machine, 0, ay8910_latch_2);
+			ay8910_control_port_0_w(machine, 0, ay8910_latch_2);
 			break;
 	}
 }
@@ -271,28 +271,28 @@ static WRITE8_HANDLER( demoneye_ay8910_data_w )
 	{
 		case 0x00:
 			if (ay8910_latch_1 & 0x10)
-				AY8910_write_port_0_w(machine, 0, data);
+				ay8910_write_port_0_w(machine, 0, data);
 
 			if (ay8910_latch_1 & 0x20)
-				AY8910_write_port_1_w(machine, 0, data);
+				ay8910_write_port_1_w(machine, 0, data);
 
 			break;
 
 		case 0x01:
 			if (ay8910_latch_1 & 0x10)
-				ay8910_latch_2 = AY8910_read_port_0_r(machine, 0);
+				ay8910_latch_2 = ay8910_read_port_0_r(machine, 0);
 
 			if (ay8910_latch_1 & 0x20)
-				ay8910_latch_2 = AY8910_read_port_1_r(machine, 0);
+				ay8910_latch_2 = ay8910_read_port_1_r(machine, 0);
 
 			break;
 
 		case 0x03:
 			if (ay8910_latch_1 & 0x10)
-				AY8910_control_port_0_w(machine, 0, data);
+				ay8910_control_port_0_w(machine, 0, data);
 
 			if (ay8910_latch_1 & 0x20)
-				AY8910_control_port_1_w(machine, 0, data);
+				ay8910_control_port_1_w(machine, 0, data);
 
 			break;
 
diff --git a/src/mame/audio/scramble.c b/src/mame/audio/scramble.c
index f48fa99da59..50af53898cb 100644
--- a/src/mame/audio/scramble.c
+++ b/src/mame/audio/scramble.c
@@ -327,8 +327,8 @@ static TIMER_CALLBACK( ad2083_step )
 	if (ctrl & 0x40)
 		speech_rom_address = 0;
 
-	tms5110_CTL_w(machine, 0, ctrl & 0x04 ? TMS5110_CMD_SPEAK : TMS5110_CMD_RESET);
-	tms5110_PDC_w(machine, 0, ctrl & 0x02 ? 0 : 1);
+	tms5110_ctl_w(machine, 0, ctrl & 0x04 ? TMS5110_CMD_SPEAK : TMS5110_CMD_RESET);
+	tms5110_pdc_w(machine, 0, ctrl & 0x02 ? 0 : 1);
 
 	if (!(ctrl & 0x80))
 		timer_set(ATTOTIME_IN_HZ(AD2083_TMS5110_CLOCK / 2),NULL,1,ad2083_step);
@@ -406,10 +406,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ad2083_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x01, 0x01) AM_WRITE(ad2083_tms5110_ctrl_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x40, 0x40) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 static SOUND_START( ad2083 )
diff --git a/src/mame/audio/segag80r.c b/src/mame/audio/segag80r.c
index a1a8c70a9ab..14efd205eae 100644
--- a/src/mame/audio/segag80r.c
+++ b/src/mame/audio/segag80r.c
@@ -785,7 +785,7 @@ static const samples_interface monsterb_samples_interface =
 };
 
 
-static const struct TMS36XXinterface monsterb_tms3617_interface =
+static const tms36xx_interface monsterb_tms3617_interface =
 {
 	TMS3617,
 	{0.5,0.5,0.5,0.5,0.5,0.5}  /* decay times of voices */
@@ -807,7 +807,7 @@ static ADDRESS_MAP_START( monsterb_7751_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(I8039_t1, I8039_t1) AM_READ(n7751_t1_r)
 	AM_RANGE(I8039_p2, I8039_p2) AM_READ(n7751_command_r)
 	AM_RANGE(I8039_bus, I8039_bus) AM_READ(n7751_rom_r)
-	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(n7751_busy_w)
 	AM_RANGE(I8039_p4, I8039_p6) AM_WRITE(n7751_rom_offset_w)
 	AM_RANGE(I8039_p7, I8039_p7) AM_WRITE(n7751_rom_select_w)
diff --git a/src/mame/audio/seibu.c b/src/mame/audio/seibu.c
index ace4bcb8c05..8c020011588 100644
--- a/src/mame/audio/seibu.c
+++ b/src/mame/audio/seibu.c
@@ -503,8 +503,8 @@ ADDRESS_MAP_START( seibu_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w)
 	AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w)
 	AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w)
-	AM_RANGE(0x4008, 0x4008) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x4009, 0x4009) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x4008, 0x4008) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x4009, 0x4009) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r)
 	AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r)
 	AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
@@ -523,8 +523,8 @@ ADDRESS_MAP_START( seibu2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w)
 	AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w)
 	AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w)
-	AM_RANGE(0x4008, 0x4008) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x4009, 0x4009) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x4008, 0x4008) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x4009, 0x4009) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r)
 	AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r)
 	AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
@@ -542,8 +542,8 @@ ADDRESS_MAP_START( seibu2_raiden2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w)
 	AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w)
 	AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w)
-	AM_RANGE(0x4008, 0x4008) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x4009, 0x4009) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x4008, 0x4008) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x4009, 0x4009) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r)
 	AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r)
 	AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
@@ -563,15 +563,15 @@ ADDRESS_MAP_START( seibu3_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w)
 	AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w)
 	AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w)
-	AM_RANGE(0x4008, 0x4008) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x4009, 0x4009) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x4008, 0x4008) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x4009, 0x4009) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r)
 	AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r)
 	AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
 	AM_RANGE(0x4018, 0x4019) AM_WRITE(seibu_main_data_w)
 	AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w)
-	AM_RANGE(0x6008, 0x6008) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x6009, 0x6009) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x6008, 0x6008) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x6009, 0x6009) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1)
 ADDRESS_MAP_END
 
@@ -584,8 +584,8 @@ ADDRESS_MAP_START( seibu3_adpcm_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w)
 	AM_RANGE(0x4005, 0x4006) AM_WRITE(seibu_adpcm_adr_1_w)
 	AM_RANGE(0x4007, 0x4007) AM_WRITE(seibu_bank_w)
-	AM_RANGE(0x4008, 0x4008) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x4009, 0x4009) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x4008, 0x4008) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x4009, 0x4009) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r)
 	AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r)
 	AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
@@ -593,8 +593,8 @@ ADDRESS_MAP_START( seibu3_adpcm_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x401a, 0x401a) AM_WRITE(seibu_adpcm_ctl_1_w)
 	AM_RANGE(0x401b, 0x401b) AM_WRITE(seibu_coin_w)
 	AM_RANGE(0x6005, 0x6006) AM_WRITE(seibu_adpcm_adr_2_w)
-	AM_RANGE(0x6008, 0x6008) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x6009, 0x6009) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x6008, 0x6008) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x6009, 0x6009) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0x601a, 0x601a) AM_WRITE(seibu_adpcm_ctl_2_w)
 	AM_RANGE(0x8000, 0xffff) AM_ROMBANK(1)
 ADDRESS_MAP_END
diff --git a/src/mame/audio/system16.c b/src/mame/audio/system16.c
index 0fa22f4ac2a..b91c6cf9895 100644
--- a/src/mame/audio/system16.c
+++ b/src/mame/audio/system16.c
@@ -76,7 +76,7 @@ READ8_HANDLER( sys16_7751_sh_command_r )
 /* write to P1 */
 WRITE8_HANDLER( sys16_7751_sh_dac_w )
 {
-	DAC_data_w(0,data);
+	dac_data_w(0,data);
 }
 
 /* write to P2 */
diff --git a/src/mame/audio/t5182.c b/src/mame/audio/t5182.c
index b180fc8df01..4b2e43d0c66 100644
--- a/src/mame/audio/t5182.c
+++ b/src/mame/audio/t5182.c
@@ -278,8 +278,8 @@ ADDRESS_MAP_END
 	// 50  W test mode status flags (bit 0 = ROM test fail, bit 1 = RAM test fail, bit 2 = YM2151 IRQ not received)
 ADDRESS_MAP_START( t5182_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x10, 0x10) AM_WRITE(t5182_sharedram_semaphore_snd_acquire_w)
 	AM_RANGE(0x11, 0x11) AM_WRITE(t5182_sharedram_semaphore_snd_release_w)
 	AM_RANGE(0x12, 0x12) AM_WRITE(t5182_ym2151_irq_ack_w)
diff --git a/src/mame/audio/taito_en.c b/src/mame/audio/taito_en.c
index b107c98acb9..86f51d3dee1 100644
--- a/src/mame/audio/taito_en.c
+++ b/src/mame/audio/taito_en.c
@@ -48,7 +48,7 @@ WRITE16_HANDLER( f3_es5505_bank_w )
 
 	/* mask out unused bits */
 	data &= max_banks_this_game;
-	ES5505_voice_bank_0_w(offset,data<<20);
+	es5505_voice_bank_0_w(offset,data<<20);
 }
 
 WRITE16_HANDLER( f3_volume_w )
@@ -234,7 +234,7 @@ static UINT16 *sound_ram;
 ADDRESS_MAP_START( f3_sound_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x00ffff) AM_RAM AM_MIRROR(0x30000) AM_SHARE(1) AM_BASE(&sound_ram)
 	AM_RANGE(0x140000, 0x140fff) AM_READWRITE(f3_68000_share_r, f3_68000_share_w)
-	AM_RANGE(0x200000, 0x20001f) AM_READWRITE(ES5505_data_0_r, ES5505_data_0_w)
+	AM_RANGE(0x200000, 0x20001f) AM_READWRITE(es5505_data_0_r, es5505_data_0_w)
 	AM_RANGE(0x260000, 0x2601ff) AM_READWRITE(es5510_dsp_r, es5510_dsp_w)
 	AM_RANGE(0x280000, 0x28001f) AM_READWRITE(f3_68681_r, f3_68681_w)
 	AM_RANGE(0x300000, 0x30003f) AM_WRITE(f3_es5505_bank_w)
diff --git a/src/mame/audio/targ.c b/src/mame/audio/targ.c
index 99c24f0825e..9545d6ab41b 100644
--- a/src/mame/audio/targ.c
+++ b/src/mame/audio/targ.c
@@ -63,7 +63,7 @@ WRITE8_HANDLER( targ_audio_1_w )
 {
 	/* CPU music */
 	if ((data & 0x01) != (port_1_last & 0x01))
-		DAC_data_w(0,(data & 0x01) * 0xff);
+		dac_data_w(0,(data & 0x01) * 0xff);
 
 	/* shot */
 	if (FALLING_EDGE(0x02) && !sample_playing(0))  sample_start(0,1,0);
diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c
index 0533aa4618d..58484aec55f 100644
--- a/src/mame/audio/timeplt.c
+++ b/src/mame/audio/timeplt.c
@@ -126,10 +126,10 @@ WRITE8_HANDLER( timeplt_sh_irqtrigger_w )
 static ADDRESS_MAP_START( timeplt_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x2fff) AM_ROM
 	AM_RANGE(0x3000, 0x33ff) AM_MIRROR(0x0c00) AM_RAM
-	AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(timeplt_filter_w)
 ADDRESS_MAP_END
 
@@ -138,10 +138,10 @@ static ADDRESS_MAP_START( locomotn_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x23ff) AM_MIRROR(0x0c00) AM_RAM
 	AM_RANGE(0x3000, 0x3fff) AM_WRITE(timeplt_filter_w)
-	AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x4000, 0x4000) AM_MIRROR(0x0fff) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x5000, 0x5000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/audio/trackfld.c b/src/mame/audio/trackfld.c
index 8b7772a67ba..eb00dcf7616 100644
--- a/src/mame/audio/trackfld.c
+++ b/src/mame/audio/trackfld.c
@@ -29,7 +29,7 @@ READ8_HANDLER( trackfld_sh_timer_r )
 
 READ8_HANDLER( trackfld_speech_r )
 {
-    return VLM5030_BSY() ? 0x10 : 0;
+    return vlm5030_bsy() ? 0x10 : 0;
 }
 
 static int last_addr = 0;
@@ -45,10 +45,10 @@ WRITE8_HANDLER( trackfld_sound_w )
 
         /* A8 VLM5030 ST pin */
         if( changes & 0x100 )
-            VLM5030_ST( offset&0x100 );
+            vlm5030_st( offset&0x100 );
         /* A9 VLM5030 RST pin */
         if( changes & 0x200 )
-            VLM5030_RST( offset&0x200 );
+            vlm5030_rst( offset&0x200 );
     }
     last_addr = offset;
 }
@@ -57,7 +57,7 @@ READ8_HANDLER( hyperspt_sh_timer_r )
 {
     UINT32 clock = activecpu_gettotalcycles() / TIMER_RATE;
 
-    return (clock & 0x3) | (VLM5030_BSY()? 0x04 : 0);
+    return (clock & 0x3) | (vlm5030_bsy()? 0x04 : 0);
 }
 
 WRITE8_HANDLER( hyperspt_sound_w )
@@ -72,10 +72,10 @@ WRITE8_HANDLER( hyperspt_sound_w )
 
     /* A4 VLM5030 ST pin */
     if( changes & 0x10 )
-        VLM5030_ST( offset&0x10 );
+        vlm5030_st( offset&0x10 );
     /* A5 VLM5030 RST pin */
     if( changes & 0x20 )
-        VLM5030_RST( offset&0x20 );
+        vlm5030_rst( offset&0x20 );
 
     last_addr = offset;
 }
diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c
index c1ba53e1120..78ab8a1a42e 100644
--- a/src/mame/audio/williams.c
+++ b/src/mame/audio/williams.c
@@ -99,8 +99,8 @@ static WRITE8_HANDLER( narc_slave_sync_w );
 /* CVSD readmem/writemem structures */
 static ADDRESS_MAP_START( williams_cvsd_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x1ffe) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x1ffe) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x1ffe) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x1ffe) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x4000, 0x4003) AM_MIRROR(0x1ffc) AM_READWRITE(cvsd_pia_r, cvsd_pia_w)
 	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_WRITE(hc55516_0_digit_clock_clear_w)
 	AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_WRITE(hc55516_0_clock_set_w)
@@ -112,11 +112,11 @@ ADDRESS_MAP_END
 /* NARC master readmem/writemem structures */
 static ADDRESS_MAP_START( williams_narc_master_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03fe) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x03fe) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03fe) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x03fe) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_talkback_w)
 	AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_WRITE(narc_command2_w)
-	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(narc_command_r)
 	AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(narc_master_bank_select_w)
 	AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(narc_master_sync_w)
@@ -130,7 +130,7 @@ static ADDRESS_MAP_START( williams_narc_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_WRITE(hc55516_0_clock_set_w)
 	AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03ff) AM_WRITE(hc55516_0_digit_clock_clear_w)
 	AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_talkback_w)
-	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(DAC_1_data_w)
+	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_WRITE(dac_1_data_w)
 	AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_READ(narc_command2_r)
 	AM_RANGE(0x3800, 0x3800) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_bank_select_w)
 	AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x03ff) AM_WRITE(narc_slave_sync_w)
@@ -143,9 +143,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( williams_adpcm_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
 	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x03ff) AM_WRITE(adpcm_bank_select_w)
-	AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03fe) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2401, 0x2401) AM_MIRROR(0x03fe) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
-	AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x2400, 0x2400) AM_MIRROR(0x03fe) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2401, 0x2401) AM_MIRROR(0x03fe) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
+	AM_RANGE(0x2800, 0x2800) AM_MIRROR(0x03ff) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x2c00, 0x2c00) AM_MIRROR(0x03ff) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x03ff) AM_READ(adpcm_command_r)
 	AM_RANGE(0x3400, 0x3400) AM_MIRROR(0x03ff) AM_WRITE(adpcm_6295_bank_select_w)
@@ -160,7 +160,7 @@ ADDRESS_MAP_END
 static const pia6821_interface cvsd_pia_intf =
 {
 	/*inputs : A/B,CA/B1,CA/B2 */ 0, 0, 0, 0, 0, 0,
-	/*outputs: A/B,CA/B2       */ DAC_0_data_w, cvsd_talkback_w, 0, 0,
+	/*outputs: A/B,CA/B2       */ dac_0_data_w, cvsd_talkback_w, 0, 0,
 	/*irqs   : A/B             */ cvsd_irqa, cvsd_irqb
 };
 
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c
index 604921bca3c..4915ba3902c 100644
--- a/src/mame/drivers/1942.c
+++ b/src/mame/drivers/1942.c
@@ -137,10 +137,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x47ff) AM_RAM
 	AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 20559388a4f..2ead2e06bd6 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -85,10 +85,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 /* Input Ports */
diff --git a/src/mame/drivers/20pacgal.c b/src/mame/drivers/20pacgal.c
index 10bd73f30a3..896891df4dc 100644
--- a/src/mame/drivers/20pacgal.c
+++ b/src/mame/drivers/20pacgal.c
@@ -88,7 +88,7 @@ static const namco_interface namco_config =
 
 static WRITE8_HANDLER( _20pacgal_dac_w )
 {
-	DAC_signed_data_w(0, data);
+	dac_signed_data_w(0, data);
 }
 
 
diff --git a/src/mame/drivers/2mindril.c b/src/mame/drivers/2mindril.c
index a86ae31067d..1ad6fec87fd 100644
--- a/src/mame/drivers/2mindril.c
+++ b/src/mame/drivers/2mindril.c
@@ -135,10 +135,10 @@ static ADDRESS_MAP_START( drill_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x500000, 0x501fff) AM_RAM_WRITE(paletteram16_RRRRGGGGBBBBRGBx_word_w) AM_BASE(&paletteram16)
 	AM_RANGE(0x502000, 0x503fff) AM_RAM
 	AM_RANGE(0x700000, 0x70000f) AM_READ(drill_unk_r) AM_WRITE(SMH_NOP) // i/o
-	AM_RANGE(0x600000, 0x600001) AM_READ(YM2610_status_port_0_A_lsb_r) AM_WRITE(YM2610_control_port_0_A_lsb_w)
-	AM_RANGE(0x600002, 0x600003) AM_READ(YM2610_read_port_0_lsb_r) AM_WRITE(YM2610_data_port_0_A_lsb_w)
-	AM_RANGE(0x600004, 0x600005) AM_READ(YM2610_status_port_0_B_lsb_r) AM_WRITE(YM2610_control_port_0_B_lsb_w)
-	AM_RANGE(0x600006, 0x600007) AM_WRITE(YM2610_data_port_0_B_lsb_w)
+	AM_RANGE(0x600000, 0x600001) AM_READ(ym2610_status_port_0_a_lsb_r) AM_WRITE(ym2610_control_port_0_a_lsb_w)
+	AM_RANGE(0x600002, 0x600003) AM_READ(ym2610_read_port_0_lsb_r) AM_WRITE(ym2610_data_port_0_a_lsb_w)
+	AM_RANGE(0x600004, 0x600005) AM_READ(ym2610_status_port_0_b_lsb_r) AM_WRITE(ym2610_control_port_0_b_lsb_w)
+	AM_RANGE(0x600006, 0x600007) AM_WRITE(ym2610_data_port_0_b_lsb_w)
 	AM_RANGE(0x60000c, 0x60000d) AM_READ(SMH_NOP) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x60000e, 0x60000f) AM_READ(SMH_NOP) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c
index 7776662cf2c..af0cfbbd6a6 100644
--- a/src/mame/drivers/40love.c
+++ b/src/mame/drivers/40love.c
@@ -780,15 +780,15 @@ static WRITE8_HANDLER( sound_control_3_w ) /* unknown */
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xca00, 0xca0d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0xcc00, 0xcc00) AM_WRITE(sound_control_0_w)
 	AM_RANGE(0xce00, 0xce00) AM_WRITE(sound_control_1_w)
 	AM_RANGE(0xd800, 0xd800) AM_READWRITE(soundlatch_r, to_main_w)
 	AM_RANGE(0xda00, 0xda00) AM_READNOP AM_WRITE(nmi_enable_w) /* unknown read */
 	AM_RANGE(0xdc00, 0xdc00) AM_WRITE(nmi_disable_w)
-	AM_RANGE(0xde00, 0xde00) AM_READNOP AM_WRITE(DAC_0_signed_data_w)		/* signed 8-bit DAC - unknown read */
+	AM_RANGE(0xde00, 0xde00) AM_READNOP AM_WRITE(dac_0_signed_data_w)		/* signed 8-bit DAC - unknown read */
 	AM_RANGE(0xe000, 0xefff) AM_ROM /* space for diagnostics ROM */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/4enraya.c b/src/mame/drivers/4enraya.c
index 4dc98e5e90c..e333d6b1c3b 100644
--- a/src/mame/drivers/4enraya.c
+++ b/src/mame/drivers/4enraya.c
@@ -71,9 +71,9 @@ static WRITE8_HANDLER( sound_control_w )
 	if ((last & 0x04) == 0x04 && (data & 0x4) == 0x00)
 	{
 		if (last & 0x01)
-			AY8910_control_port_0_w(machine,0,soundlatch);
+			ay8910_control_port_0_w(machine,0,soundlatch);
 		else
-			AY8910_write_port_0_w(machine,0,soundlatch);
+			ay8910_write_port_0_w(machine,0,soundlatch);
 	}
 	last=data;
 }
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 6ab192434ea..1a45fd91278 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -147,8 +147,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x9000, 0x9000) AM_WRITE(speech_msg_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(speech_control_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index d624a670d38..e75c1b39088 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -114,10 +114,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( dec0_s_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r)
 	AM_RANGE(0x3800, 0x3800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x4000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c
index 1f6c6adfd30..3c52fed0937 100644
--- a/src/mame/drivers/aeroboto.c
+++ b/src/mame/drivers/aeroboto.c
@@ -98,12 +98,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_RAM
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x9002, 0x9002) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0xa002, 0xa002) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x9002, 0x9002) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0xa002, 0xa002) AM_READ(ay8910_read_port_1_r)
 	AM_RANGE(0xf000, 0xffff) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c
index 3eb3d150122..f62ef4fb791 100644
--- a/src/mame/drivers/aerofgt.c
+++ b/src/mame/drivers/aerofgt.c
@@ -409,18 +409,18 @@ static ADDRESS_MAP_START( turbofrc_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(aerofgt_sh_bankswitch_w)
 	AM_RANGE(0x14, 0x14) AM_READWRITE(soundlatch_r, pending_command_clear_w)
-	AM_RANGE(0x18, 0x18) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0x19, 0x19) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x1a, 0x1a) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0x1b, 0x1b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x18, 0x18) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0x19, 0x19) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x1a, 0x1a) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0x1b, 0x1b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( aerofgt_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(aerofgt_sh_bankswitch_w)
 	AM_RANGE(0x08, 0x08) AM_WRITE(pending_command_clear_w)
 	AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r)
@@ -436,8 +436,8 @@ static ADDRESS_MAP_START( wbbc97_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xf800, 0xf800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
-	AM_RANGE(0xf810, 0xf810) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xf811, 0xf811) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xf810, 0xf810) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xf811, 0xf811) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_NOP
 	AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/airbustr.c b/src/mame/drivers/airbustr.c
index edbe24875cc..b1835ef755d 100644
--- a/src/mame/drivers/airbustr.c
+++ b/src/mame/drivers/airbustr.c
@@ -418,8 +418,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(sound_bankswitch_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x04, 0x04) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x06, 0x06) AM_READWRITE(soundcommand_r, soundcommand2_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ajax.c b/src/mame/drivers/ajax.c
index 1485cb9dcf7..5c9a44105ce 100644
--- a/src/mame/drivers/ajax.c
+++ b/src/mame/drivers/ajax.c
@@ -51,8 +51,8 @@ static ADDRESS_MAP_START( ajax_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xb000, 0xb00d) AM_READWRITE(k007232_read_port_1_r, k007232_write_port_1_w)		/* 007232 registers (chip 2) */
 	AM_RANGE(0xb80c, 0xb80c) AM_WRITE(k007232_extvol_w)			/* extra volume, goes to the 007232 w/ A11 */
 																/* selecting a different latch for the external port */
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)	/* YM2151 */
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)		/* YM2151 */
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)	/* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)		/* YM2151 */
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)				/* soundlatch_r */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/aliens.c b/src/mame/drivers/aliens.c
index bd19d29235d..ea1812851cc 100644
--- a/src/mame/drivers/aliens.c
+++ b/src/mame/drivers/aliens.c
@@ -107,8 +107,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( aliens_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM								/* ROM g04_b03.bin */
 	AM_RANGE(0x8000, 0x87ff) AM_RAM								/* RAM */
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r)				/* soundlatch_r */
 	AM_RANGE(0xe000, 0xe00d) AM_READWRITE(k007232_read_port_0_r, k007232_write_port_0_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c
index d8976af0114..13c17a78c27 100644
--- a/src/mame/drivers/alpha68k.c
+++ b/src/mame/drivers/alpha68k.c
@@ -786,7 +786,7 @@ static ADDRESS_MAP_START( kyros_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
 	AM_RANGE(0xe002, 0xe002) AM_WRITE(soundlatch_clear_w)
-	AM_RANGE(0xe004, 0xe004) AM_WRITE(DAC_0_signed_data_w)
+	AM_RANGE(0xe004, 0xe004) AM_WRITE(dac_0_signed_data_w)
 	AM_RANGE(0xe006, 0xe00e) AM_WRITE(SMH_NOP) // soundboard I/O's, ignored
 /* reference only
     AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_NOP) // NMI: diminishing saw-tooth
@@ -802,7 +802,7 @@ static ADDRESS_MAP_START( sstingry_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xc100, 0xc100) AM_READ(soundlatch_r)
 	AM_RANGE(0xc102, 0xc102) AM_WRITE(soundlatch_clear_w)
-	AM_RANGE(0xc104, 0xc104) AM_WRITE(DAC_0_signed_data_w)
+	AM_RANGE(0xc104, 0xc104) AM_WRITE(dac_0_signed_data_w)
 	AM_RANGE(0xc106, 0xc10e) AM_WRITENOP // soundboard I/O's, ignored
 ADDRESS_MAP_END
 
@@ -814,8 +814,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( alpha68k_I_s_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x9fff) AM_ROM
 	AM_RANGE(0xe000, 0xe000) AM_READWRITE(soundlatch_r, soundlatch_clear_w)
-	AM_RANGE(0xe800, 0xe800) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xfc00, 0xfc00) AM_RAM // unknown port
 ADDRESS_MAP_END
@@ -830,36 +830,36 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, soundlatch_clear_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(DAC_0_signed_data_w)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2413_data_port_0_w)
-	AM_RANGE(0x0c, 0x0c) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x0d, 0x0d) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(dac_0_signed_data_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2413_data_port_0_w)
+	AM_RANGE(0x0c, 0x0c) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x0d, 0x0d) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x0e, 0x0e) AM_WRITE(sound_bank_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( kyros_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x11, 0x11) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM2203_write_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x90, 0x90) AM_WRITE(YM2203_write_port_2_w)
-	AM_RANGE(0x91, 0x91) AM_WRITE(YM2203_control_port_2_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x11, 0x11) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym2203_write_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x90, 0x90) AM_WRITE(ym2203_write_port_2_w)
+	AM_RANGE(0x91, 0x91) AM_WRITE(ym2203_control_port_2_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( jongbou_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w)
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tnexspce_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x3b, 0x3b) AM_READNOP // unknown read port
 	AM_RANGE(0x3d, 0x3d) AM_READNOP // unknown read port
 	AM_RANGE(0x7b, 0x7b) AM_READNOP // unknown read port
diff --git a/src/mame/drivers/ambush.c b/src/mame/drivers/ambush.c
index 276649336eb..f3a127b9d46 100644
--- a/src/mame/drivers/ambush.c
+++ b/src/mame/drivers/ambush.c
@@ -74,10 +74,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_READWRITE(AY8910_read_port_1_r, AY8910_control_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_READWRITE(ay8910_read_port_1_r, ay8910_control_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c
index 7c04c9f4b5c..daa7ff5adbf 100644
--- a/src/mame/drivers/ampoker2.c
+++ b/src/mame/drivers/ampoker2.c
@@ -593,9 +593,9 @@ static ADDRESS_MAP_START( ampoker2_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x35, 0x35) AM_WRITE (ampoker2_port35_w)	/* see write handlers */
 	AM_RANGE(0x36, 0x36) AM_WRITE (ampoker2_port36_w)	/* see write handlers */
 	AM_RANGE(0x37, 0x37) AM_WRITE(ampoker2_watchdog_reset_w)
-	AM_RANGE(0x38, 0x38) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x39, 0x39) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x3A, 0x3A) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x38, 0x38) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x39, 0x39) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x3A, 0x3A) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c
index 7f1e299cd99..77b579734cf 100644
--- a/src/mame/drivers/amspdwy.c
+++ b/src/mame/drivers/amspdwy.c
@@ -64,7 +64,7 @@ AMSPDWY_WHEEL_R( 1 )
 
 static READ8_HANDLER( amspdwy_sound_r )
 {
-	return (YM2151_status_port_0_r(machine,0) & ~ 0x30) | input_port_read(machine, "IN0");
+	return (ym2151_status_port_0_r(machine,0) & ~ 0x30) | input_port_read(machine, "IN0");
 }
 
 static WRITE8_HANDLER( amspdwy_sound_w )
@@ -115,8 +115,8 @@ static ADDRESS_MAP_START( amspdwy_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM									// ROM
 //  AM_RANGE(0x8000, 0x8000) AM_WRITENOP                            // ? Written with 0 at the start
 	AM_RANGE(0x9000, 0x9000) AM_READ(soundlatch_r)					// From Main CPU
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w)		// YM2151
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2151_data_port_0_w)			//
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2151_register_port_0_w)		// YM2151
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2151_data_port_0_w)			//
 	AM_RANGE(0xc000, 0xdfff) AM_RAM									// Work RAM
 	AM_RANGE(0xffff, 0xffff) AM_READNOP								// ??? IY = FFFF at the start ?
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/angelkds.c b/src/mame/drivers/angelkds.c
index 87198ee8784..26675600213 100644
--- a/src/mame/drivers/angelkds.c
+++ b/src/mame/drivers/angelkds.c
@@ -262,10 +262,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sub_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x40, 0x40) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0x80, 0x83) AM_READWRITE(angelkds_sub_sound_r, angelkds_sub_sound_w) // spcpostn
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/aquarium.c b/src/mame/drivers/aquarium.c
index b2c36a79242..f91d26a75bd 100644
--- a/src/mame/drivers/aquarium.c
+++ b/src/mame/drivers/aquarium.c
@@ -169,8 +169,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( snd_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_READWRITE(aquarium_oki_r, aquarium_oki_w)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
 	AM_RANGE(0x06, 0x06) AM_WRITE(aquarium_snd_ack_w)
diff --git a/src/mame/drivers/arabian.c b/src/mame/drivers/arabian.c
index c70f9a144a9..c347c2b2a6f 100644
--- a/src/mame/drivers/arabian.c
+++ b/src/mame/drivers/arabian.c
@@ -229,8 +229,8 @@ ADDRESS_MAP_END
  *************************************/
 
 static ADDRESS_MAP_START( main_io_map, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_MIRROR(0x01ff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xca00, 0xca00) AM_MIRROR(0x01ff) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/argus.c b/src/mame/drivers/argus.c
index f69bea52149..30fd2e1468a 100644
--- a/src/mame/drivers/argus.c
+++ b/src/mame/drivers/argus.c
@@ -404,16 +404,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap_1, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap_2, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 6f4670dac3c..9e853e6ff17 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -483,8 +483,8 @@ int arkanoid_bootleg_id;
 static ADDRESS_MAP_START( arkanoid_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w)	/* gfx bank, flip screen etc. */
 	AM_RANGE(0xd00c, 0xd00c) AM_READ(arkanoid_68705_input_0_r)  /* mainly an input port, with 2 bits from the 68705 */
 	AM_RANGE(0xd010, 0xd010) AM_READ_PORT("IN1") AM_WRITE(watchdog_reset_w)
@@ -498,8 +498,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( bootleg_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0xd008, 0xd008) AM_WRITE(arkanoid_d008_w)	/* gfx bank, flip screen etc. */
 	AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("IN0")
 	AM_RANGE(0xd010, 0xd010) AM_READ_PORT("IN1") AM_WRITE(watchdog_reset_w)
diff --git a/src/mame/drivers/armedf.c b/src/mame/drivers/armedf.c
index 26073f5513e..e4c551491d5 100644
--- a/src/mame/drivers/armedf.c
+++ b/src/mame/drivers/armedf.c
@@ -451,10 +451,10 @@ static READ8_HANDLER( soundlatch_clear_r )
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x0, 0x0) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x1, 0x1) AM_WRITE(YM3812_write_port_0_w)
-  	AM_RANGE(0x2, 0x2) AM_WRITE(DAC_0_signed_data_w)
-  	AM_RANGE(0x3, 0x3) AM_WRITE(DAC_1_signed_data_w)
+	AM_RANGE(0x0, 0x0) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x1, 0x1) AM_WRITE(ym3812_write_port_0_w)
+  	AM_RANGE(0x2, 0x2) AM_WRITE(dac_0_signed_data_w)
+  	AM_RANGE(0x3, 0x3) AM_WRITE(dac_1_signed_data_w)
 	AM_RANGE(0x4, 0x4) AM_READ(soundlatch_clear_r)
 	AM_RANGE(0x6, 0x6) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c
index cf591e2ed60..80514a86354 100644
--- a/src/mame/drivers/ashnojoe.c
+++ b/src/mame/drivers/ashnojoe.c
@@ -163,8 +163,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_WRITE(adpcm_data_w)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r) //PC: 15D -> cp $7f
 	AM_RANGE(0x06, 0x06) AM_READ(fake_6_r/*soundlatch_r */) //PC: 14A -> and $1
diff --git a/src/mame/drivers/asterix.c b/src/mame/drivers/asterix.c
index 6bfad13c923..cb5885ac370 100644
--- a/src/mame/drivers/asterix.c
+++ b/src/mame/drivers/asterix.c
@@ -208,10 +208,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
-	AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa2f) AM_READWRITE(k053260_0_r, k053260_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w)
-	AM_RANGE(0xfe00, 0xfe00) AM_WRITE(YM2151_register_port_0_w)
+	AM_RANGE(0xfe00, 0xfe00) AM_WRITE(ym2151_register_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/astrocde.c b/src/mame/drivers/astrocde.c
index 9b514bdfb6e..5304682e5af 100644
--- a/src/mame/drivers/astrocde.c
+++ b/src/mame/drivers/astrocde.c
@@ -716,9 +716,9 @@ static ADDRESS_MAP_START( tenpin_sub_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x90, 0x93) AM_READWRITE(z80ctc_0_r, z80ctc_0_w)
 	AM_RANGE(0x97, 0x97) AM_READ(soundlatch_r)
-	AM_RANGE(0x98, 0x98) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x98, 0x98) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x9a, 0x9a) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x98, 0x98) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x98, 0x98) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x9a, 0x9a) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/asuka.c b/src/mame/drivers/asuka.c
index 4a9df6bc56d..37d692bf380 100644
--- a/src/mame/drivers/asuka.c
+++ b/src/mame/drivers/asuka.c
@@ -381,10 +381,10 @@ static ADDRESS_MAP_START( bonzeadv_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2610_read_port_0_r, ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITENOP /* pan */
@@ -398,8 +398,8 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 //  AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
@@ -413,8 +413,8 @@ static ADDRESS_MAP_START( cadash_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/atarisy1.c b/src/mame/drivers/atarisy1.c
index 120647f41f7..a1236638fdb 100644
--- a/src/mame/drivers/atarisy1.c
+++ b/src/mame/drivers/atarisy1.c
@@ -453,8 +453,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_RAM
 	AM_RANGE(0x1000, 0x100f) AM_READWRITE(via_0_r, via_0_w)
-	AM_RANGE(0x1800, 0x1800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x1800, 0x1801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x1800, 0x1800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x1800, 0x1801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x1810, 0x1810) AM_READWRITE(atarigen_6502_sound_r, atarigen_6502_sound_w)
 	AM_RANGE(0x1820, 0x1820) AM_READ(switch_6502_r)
 	AM_RANGE(0x1824, 0x1825) AM_WRITE(led_w)
diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c
index 8000f500bf8..2381703d6c0 100644
--- a/src/mame/drivers/atarisy2.c
+++ b/src/mame/drivers/atarisy2.c
@@ -749,8 +749,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1810, 0x1813) AM_MIRROR(0x278c) AM_READ(leta_r)
 	AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x2780) AM_READWRITE(pokey2_r, pokey2_w)
 	AM_RANGE(0x1840, 0x1840) AM_MIRROR(0x278f) AM_READ(switch_6502_r)
-	AM_RANGE(0x1850, 0x1850) AM_MIRROR(0x278e) AM_READWRITE(YM2151_status_port_0_r, YM2151_register_port_0_w)
-	AM_RANGE(0x1851, 0x1851) AM_MIRROR(0x278e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x1850, 0x1850) AM_MIRROR(0x278e) AM_READWRITE(ym2151_status_port_0_r, ym2151_register_port_0_w)
+	AM_RANGE(0x1851, 0x1851) AM_MIRROR(0x278e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x1860, 0x1860) AM_MIRROR(0x278f) AM_READ(sound_6502_r)
 	AM_RANGE(0x1870, 0x1870) AM_MIRROR(0x2781) AM_WRITE(tms5220_w)
 	AM_RANGE(0x1872, 0x1873) AM_MIRROR(0x2780) AM_WRITE(tms5220_strobe_w)
diff --git a/src/mame/drivers/aztarac.c b/src/mame/drivers/aztarac.c
index 24b630f4617..c7c6274d1fb 100644
--- a/src/mame/drivers/aztarac.c
+++ b/src/mame/drivers/aztarac.c
@@ -97,14 +97,14 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x8800, 0x8800) AM_READ(aztarac_snd_command_r)
-	AM_RANGE(0x8c00, 0x8c00) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x8c01, 0x8c01) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x8c02, 0x8c02) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x8c03, 0x8c03) AM_READWRITE(AY8910_read_port_1_r, AY8910_control_port_1_w)
-	AM_RANGE(0x8c04, 0x8c04) AM_READWRITE(AY8910_read_port_2_r, AY8910_write_port_2_w)
-	AM_RANGE(0x8c05, 0x8c05) AM_READWRITE(AY8910_read_port_2_r, AY8910_control_port_2_w)
-	AM_RANGE(0x8c06, 0x8c06) AM_READWRITE(AY8910_read_port_3_r, AY8910_write_port_3_w)
-	AM_RANGE(0x8c07, 0x8c07) AM_READWRITE(AY8910_read_port_3_r, AY8910_control_port_3_w)
+	AM_RANGE(0x8c00, 0x8c00) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x8c01, 0x8c01) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x8c02, 0x8c02) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x8c03, 0x8c03) AM_READWRITE(ay8910_read_port_1_r, ay8910_control_port_1_w)
+	AM_RANGE(0x8c04, 0x8c04) AM_READWRITE(ay8910_read_port_2_r, ay8910_write_port_2_w)
+	AM_RANGE(0x8c05, 0x8c05) AM_READWRITE(ay8910_read_port_2_r, ay8910_control_port_2_w)
+	AM_RANGE(0x8c06, 0x8c06) AM_READWRITE(ay8910_read_port_3_r, ay8910_write_port_3_w)
+	AM_RANGE(0x8c07, 0x8c07) AM_READWRITE(ay8910_read_port_3_r, ay8910_control_port_3_w)
 	AM_RANGE(0x9000, 0x9000) AM_READWRITE(aztarac_snd_status_r, aztarac_snd_status_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c
index edf8bb92f35..8ebd5bfcfc3 100644
--- a/src/mame/drivers/backfire.c
+++ b/src/mame/drivers/backfire.c
@@ -266,15 +266,15 @@ static WRITE32_HANDLER(wcvol95_nonbuffered_palette_w)
 
 static READ32_HANDLER( deco156_snd_r )
 {
-	return YMZ280B_status_0_r(machine, 0);
+	return ymz280b_status_0_r(machine, 0);
 }
 
 static WRITE32_HANDLER( deco156_snd_w )
 {
 	if (offset)
-		YMZ280B_data_0_w(machine, 0, data);
+		ymz280b_data_0_w(machine, 0, data);
 	else
-		YMZ280B_register_0_w(machine, 0, data);
+		ymz280b_register_0_w(machine, 0, data);
 }
 
 /* map 32-bit writes to 16-bit */
@@ -467,7 +467,7 @@ static void sound_irq_gen(running_machine *machine, int state)
 	logerror("sound irq\n");
 }
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	sound_irq_gen
 };
diff --git a/src/mame/drivers/badlands.c b/src/mame/drivers/badlands.c
index f1d46a93d0d..0010a59d9e3 100644
--- a/src/mame/drivers/badlands.c
+++ b/src/mame/drivers/badlands.c
@@ -341,8 +341,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_READWRITE(YM2151_status_port_0_r, YM2151_register_port_0_w)
-	AM_RANGE(0x2000, 0x2001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_READWRITE(ym2151_status_port_0_r, ym2151_register_port_0_w)
+	AM_RANGE(0x2000, 0x2001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x2800, 0x2bff) AM_READWRITE(audio_io_r, audio_io_w)
 	AM_RANGE(0x3000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c
index 322c608e68f..aff560f39fe 100644
--- a/src/mame/drivers/bagman.c
+++ b/src/mame/drivers/bagman.c
@@ -86,10 +86,10 @@ static void start_talking (running_machine *machine)
 #endif
 
 	speech_rom_address = 0x0;
-	tms5110_CTL_w(machine,0,TMS5110_CMD_SPEAK);
-	tms5110_PDC_w(machine,0,0);
-	tms5110_PDC_w(machine,0,1);
-	tms5110_PDC_w(machine,0,0);
+	tms5110_ctl_w(machine,0,TMS5110_CMD_SPEAK);
+	tms5110_pdc_w(machine,0,0);
+	tms5110_pdc_w(machine,0,1);
+	tms5110_pdc_w(machine,0,0);
 }
 
 static void reset_talking (running_machine *machine)
@@ -98,18 +98,18 @@ static void reset_talking (running_machine *machine)
   the function calls below. In real they happen with the frequency of 160 kHz.
 */
 
-	tms5110_CTL_w(machine,0,TMS5110_CMD_RESET);
-	tms5110_PDC_w(machine,0,0);
-	tms5110_PDC_w(machine,0,1);
-	tms5110_PDC_w(machine,0,0);
+	tms5110_ctl_w(machine,0,TMS5110_CMD_RESET);
+	tms5110_pdc_w(machine,0,0);
+	tms5110_pdc_w(machine,0,1);
+	tms5110_pdc_w(machine,0,0);
 
-	tms5110_PDC_w(machine,0,0);
-	tms5110_PDC_w(machine,0,1);
-	tms5110_PDC_w(machine,0,0);
+	tms5110_pdc_w(machine,0,0);
+	tms5110_pdc_w(machine,0,1);
+	tms5110_pdc_w(machine,0,0);
 
-	tms5110_PDC_w(machine,0,0);
-	tms5110_PDC_w(machine,0,1);
-	tms5110_PDC_w(machine,0,0);
+	tms5110_pdc_w(machine,0,0);
+	tms5110_pdc_w(machine,0,1);
+	tms5110_pdc_w(machine,0,0);
 
 	speech_rom_address = 0x0;
 }
@@ -230,15 +230,15 @@ static ADDRESS_MAP_START( pickin_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xa007, 0xa007) AM_WRITE(SMH_NOP)	/* ???? */
 
 	/* guess */
-	AM_RANGE(0xb000, 0xb000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xb800, 0xb800) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0xb000, 0xb000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xb800, 0xb800) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0c, 0x0c) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0c, 0x0c) AM_READ(ay8910_read_port_0_r)
 	//AM_RANGE(0x56, 0x56) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/battlane.c b/src/mame/drivers/battlane.c
index d721bb8c534..ff9d643bd71 100644
--- a/src/mame/drivers/battlane.c
+++ b/src/mame/drivers/battlane.c
@@ -97,8 +97,8 @@ static ADDRESS_MAP_START( battlane_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1c01, 0x1c01) AM_READ_PORT("P2") AM_WRITE(battlane_scrollx_w)
 	AM_RANGE(0x1c02, 0x1c02) AM_READ_PORT("DSW1") AM_WRITE(battlane_scrolly_w)
 	AM_RANGE(0x1c03, 0x1c03) AM_READ_PORT("DSW2") AM_WRITE(battlane_cpu_command_w)
-	AM_RANGE(0x1c04, 0x1c04) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-	AM_RANGE(0x1c05, 0x1c05) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x1c04, 0x1c04) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+	AM_RANGE(0x1c05, 0x1c05) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x1e00, 0x1e3f) AM_WRITE(battlane_palette_w)
 	AM_RANGE(0x2000, 0x3fff) AM_RAM_WRITE(battlane_bitmap_w) AM_SHARE(4)
 	AM_RANGE(0x4000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/battlera.c b/src/mame/drivers/battlera.c
index 3fe0f8a719e..d0c2fcd7e7b 100644
--- a/src/mame/drivers/battlera.c
+++ b/src/mame/drivers/battlera.c
@@ -96,8 +96,8 @@ ADDRESS_MAP_END
 static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
-	case 0: YM2203_control_port_0_w(machine,0,data); break;
-	case 1: YM2203_write_port_0_w(machine,0,data); break;
+	case 0: ym2203_control_port_0_w(machine,0,data); break;
+	case 1: ym2203_write_port_0_w(machine,0,data); break;
 	}
 }
 
@@ -129,7 +129,7 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
  	AM_RANGE(0x000000, 0x00ffff) AM_ROM
 	AM_RANGE(0x040000, 0x040001) AM_WRITE(YM2203_w)
 	AM_RANGE(0x080000, 0x080001) AM_WRITE(battlera_adpcm_data_w)
-	AM_RANGE(0x1fe800, 0x1fe80f) AM_WRITE(C6280_0_w)
+	AM_RANGE(0x1fe800, 0x1fe80f) AM_WRITE(c6280_0_w)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_RAMBANK(7) /* Main ram */
 	AM_RANGE(0x1ff000, 0x1ff001) AM_READWRITE(soundlatch_r, battlera_adpcm_reset_w)
 	AM_RANGE(0x1ff400, 0x1ff403) AM_WRITE(H6280_irq_status_w)
diff --git a/src/mame/drivers/battlex.c b/src/mame/drivers/battlex.c
index c0e938e1558..e7120d125ba 100644
--- a/src/mame/drivers/battlex.c
+++ b/src/mame/drivers/battlex.c
@@ -87,8 +87,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x10, 0x10) AM_WRITE(battlex_flipscreen_w)
 	/* verify all of these */
-	AM_RANGE(0x22, 0x22) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x23, 0x23) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x22, 0x22) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x23, 0x23) AM_WRITE(ay8910_control_port_0_w)
 
 	/* 0x30 looks like scroll, but can't be ? changes (increases or decreases)
         depending on the direction your ship is facing on lev 2. at least */
diff --git a/src/mame/drivers/battlnts.c b/src/mame/drivers/battlnts.c
index 59a23f37799..3998625a6e6 100644
--- a/src/mame/drivers/battlnts.c
+++ b/src/mame/drivers/battlnts.c
@@ -71,10 +71,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( battlnts_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM							/* ROM 777c01.rom */
 	AM_RANGE(0x8000, 0x87ff) AM_RAM							/* RAM */
-	AM_RANGE(0xa000, 0xa000) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)	/* YM3812 (chip 1) */
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w)		/* YM3812 (chip 1) */
-	AM_RANGE(0xc000, 0xc000) AM_READWRITE(YM3812_status_port_1_r, YM3812_control_port_1_w)	/* YM3812 (chip 2) */
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_1_w)		/* YM3812 (chip 2) */
+	AM_RANGE(0xa000, 0xa000) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)	/* YM3812 (chip 1) */
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3812_write_port_0_w)		/* YM3812 (chip 1) */
+	AM_RANGE(0xc000, 0xc000) AM_READWRITE(ym3812_status_port_1_r, ym3812_control_port_1_w)	/* YM3812 (chip 2) */
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym3812_write_port_1_w)		/* YM3812 (chip 2) */
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)			/* soundlatch_r */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/bbusters.c b/src/mame/drivers/bbusters.c
index a4c8638a39e..84e9ad38810 100644
--- a/src/mame/drivers/bbusters.c
+++ b/src/mame/drivers/bbusters.c
@@ -360,19 +360,19 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xc0, 0xc1) AM_WRITE(SMH_NOP) /* -> Main CPU */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sounda_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2608_status_port_0_A_r, YM2608_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2608_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2608_status_port_0_B_r, YM2608_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2608_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2608_status_port_0_a_r, ym2608_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2608_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2608_status_port_0_b_r, ym2608_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2608_data_port_0_b_w)
 	AM_RANGE(0xc0, 0xc1) AM_WRITE(SMH_NOP) /* -> Main CPU */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/bfcobra.c b/src/mame/drivers/bfcobra.c
index 37b87bca2aa..ed414662f46 100644
--- a/src/mame/drivers/bfcobra.c
+++ b/src/mame/drivers/bfcobra.c
@@ -1445,8 +1445,8 @@ static ADDRESS_MAP_START( m6809_prog_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2800, 0x2800) AM_RAM		// W
 	AM_RANGE(0x2A00, 0x2A02) AM_READWRITE(latch_r, latch_w)
 	AM_RANGE(0x2E00, 0x2E00) AM_READ(int_latch_r)
-	AM_RANGE(0x3001, 0x3001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x3201, 0x3201) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x3001, 0x3001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x3201, 0x3201) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x3404, 0x3404) AM_READWRITE(acia6850_1_stat_r, acia6850_1_ctrl_w)
 	AM_RANGE(0x3405, 0x3405) AM_READWRITE(acia6850_1_data_r, acia6850_1_data_w)
 	AM_RANGE(0x3406, 0x3406) AM_READWRITE(acia6850_2_stat_r, acia6850_2_ctrl_w)
diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index 72a9ae08bd2..b2780a0db1c 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -1545,8 +1545,8 @@ static ADDRESS_MAP_START( memmap_vid, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2A00, 0x2AFF) AM_WRITE(nec_latch_w)			// this is where it reads?
 	AM_RANGE(0x2B00, 0x2BFF) AM_WRITE(nec_reset_w)			// upd7759 reset line
 	AM_RANGE(0x2C00, 0x2C00) AM_WRITE(unlock_w)				// custom chip unlock
-	AM_RANGE(0x2D00, 0x2D00) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x2D01, 0x2D01) AM_WRITE(YM2413_data_port_0_w)
+	AM_RANGE(0x2D00, 0x2D00) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x2D01, 0x2D01) AM_WRITE(ym2413_data_port_0_w)
 	AM_RANGE(0x2E00, 0x2E00) AM_WRITE(bankswitch_w)			// write bank (rom page select for 0x6000 - 0x7fff )
 	AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w)			// vfd2 data
 
diff --git a/src/mame/drivers/bigevglf.c b/src/mame/drivers/bigevglf.c
index d44d3f05df5..8b111454220 100644
--- a/src/mame/drivers/bigevglf.c
+++ b/src/mame/drivers/bigevglf.c
@@ -367,8 +367,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xca00, 0xca0d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0xcc00, 0xcc00) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xce00, 0xce00) AM_WRITE(SMH_NOP)
diff --git a/src/mame/drivers/bigfghtr.c b/src/mame/drivers/bigfghtr.c
index c9fee6f2c65..f7bbcfa7ee9 100644
--- a/src/mame/drivers/bigfghtr.c
+++ b/src/mame/drivers/bigfghtr.c
@@ -363,10 +363,10 @@ static READ8_HANDLER( soundlatch_clear_r )
 
 static ADDRESS_MAP_START( soundport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x0, 0x0) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x1, 0x1) AM_WRITE(YM3812_write_port_0_w)
-	AM_RANGE(0x2, 0x2) AM_WRITE(DAC_0_signed_data_w)
-	AM_RANGE(0x3, 0x3) AM_WRITE(DAC_1_signed_data_w)
+	AM_RANGE(0x0, 0x0) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x1, 0x1) AM_WRITE(ym3812_write_port_0_w)
+	AM_RANGE(0x2, 0x2) AM_WRITE(dac_0_signed_data_w)
+	AM_RANGE(0x3, 0x3) AM_WRITE(dac_1_signed_data_w)
 	AM_RANGE(0x4, 0x4) AM_READ(soundlatch_clear_r)
 	AM_RANGE(0x6, 0x6) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c
index 8252776a5a5..83f35415f9e 100644
--- a/src/mame/drivers/bionicc.c
+++ b/src/mame/drivers/bionicc.c
@@ -166,8 +166,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/bishi.c b/src/mame/drivers/bishi.c
index 13b2f032b36..fbd917465ef 100644
--- a/src/mame/drivers/bishi.c
+++ b/src/mame/drivers/bishi.c
@@ -146,18 +146,18 @@ static READ16_HANDLER( bishi_mirror_r )
 
 static READ16_HANDLER( bishi_sound_r )
 {
-	return YMZ280B_status_0_r(machine, offset)<<8;
+	return ymz280b_status_0_r(machine, offset)<<8;
 }
 
 static WRITE16_HANDLER( bishi_sound_w )
 {
  	if (offset)
 	{
-		YMZ280B_data_0_w(machine, offset, data>>8);
+		ymz280b_data_0_w(machine, offset, data>>8);
 	}
  	else
 	{
-		YMZ280B_register_0_w(machine, offset, data>>8);
+		ymz280b_register_0_w(machine, offset, data>>8);
 	}
 }
 
@@ -324,7 +324,7 @@ static void sound_irq_gen(running_machine *machine, int state)
 		cpunum_set_input_line(machine, 0, MC68000_IRQ_1, CLEAR_LINE);
 }
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	sound_irq_gen
 };
diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c
index 9cfd9e75c4d..7aa5d1ee6e7 100644
--- a/src/mame/drivers/bking.c
+++ b/src/mame/drivers/bking.c
@@ -169,10 +169,10 @@ static ADDRESS_MAP_START( bking_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x2fff) AM_ROM //only bking3
 	AM_RANGE(0x4000, 0x43ff) AM_RAM
-	AM_RANGE(0x4400, 0x4400) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4401, 0x4401) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x4402, 0x4402) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4403, 0x4403) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x4400, 0x4400) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4401, 0x4401) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x4402, 0x4402) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4403, 0x4403) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0x4800, 0x4800) AM_READ(soundlatch_r)
 	AM_RANGE(0x4802, 0x4802) AM_READWRITE(bking_sndnmi_disable_r, bking_sndnmi_enable_w)
 	AM_RANGE(0xe000, 0xefff) AM_ROM   /* Space for diagnostic ROM */
@@ -438,7 +438,7 @@ static const ay8910_interface ay8910_config =
 	AY8910_DEFAULT_LOADS,
 	NULL,
 	NULL,
-	DAC_0_signed_data_w,
+	dac_0_signed_data_w,
 	portb_w
 };
 
diff --git a/src/mame/drivers/bladestl.c b/src/mame/drivers/bladestl.c
index 9c1131c9cf6..8b106014e7b 100644
--- a/src/mame/drivers/bladestl.c
+++ b/src/mame/drivers/bladestl.c
@@ -128,8 +128,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
-	AM_RANGE(0x1000, 0x1000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)	/* YM2203 */
-	AM_RANGE(0x1001, 0x1001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)		/* YM2203 */
+	AM_RANGE(0x1000, 0x1000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)	/* YM2203 */
+	AM_RANGE(0x1001, 0x1001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)		/* YM2203 */
 	AM_RANGE(0x3000, 0x3000) AM_WRITE(bladestl_speech_ctrl_w)	/* UPD7759 */
 	AM_RANGE(0x4000, 0x4000) AM_READ(upd7759_0_busy_r)			/* UPD7759 */
 	AM_RANGE(0x5000, 0x5000) AM_WRITE(SMH_NOP)					/* ??? */
diff --git a/src/mame/drivers/blktiger.c b/src/mame/drivers/blktiger.c
index ef56351b3bf..c87caf35dd2 100644
--- a/src/mame/drivers/blktiger.c
+++ b/src/mame/drivers/blktiger.c
@@ -93,10 +93,10 @@ static ADDRESS_MAP_START( sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0xe003, 0xe003) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0xe003, 0xe003) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/blockhl.c b/src/mame/drivers/blockhl.c
index fc2a5ccd6fc..a14b80cf940 100644
--- a/src/mame/drivers/blockhl.c
+++ b/src/mame/drivers/blockhl.c
@@ -86,8 +86,8 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xe00c, 0xe00d) AM_WRITE(SMH_NOP)		/* leftover from missing 007232? */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/blockout.c b/src/mame/drivers/blockout.c
index c645d80b9b2..3dc54ee6beb 100644
--- a/src/mame/drivers/blockout.c
+++ b/src/mame/drivers/blockout.c
@@ -66,8 +66,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/blueprnt.c b/src/mame/drivers/blueprnt.c
index f96e418bd18..91ac5a27016 100644
--- a/src/mame/drivers/blueprnt.c
+++ b/src/mame/drivers/blueprnt.c
@@ -115,12 +115,12 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x2000, 0x2fff) AM_ROM
 	AM_RANGE(0x4000, 0x43ff) AM_RAM
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6002, 0x6002) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8002, 0x8002) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6002, 0x6002) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8002, 0x8002) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 /* Input Ports */
diff --git a/src/mame/drivers/bmcbowl.c b/src/mame/drivers/bmcbowl.c
index ba3d4a54a3b..63b3048526e 100644
--- a/src/mame/drivers/bmcbowl.c
+++ b/src/mame/drivers/bmcbowl.c
@@ -336,8 +336,8 @@ static ADDRESS_MAP_START( bmcbowl_mem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x092000, 0x09201f) AM_READWRITE(via_r,via_w)
 
 	AM_RANGE(0x093000, 0x093003) AM_WRITE(SMH_NOP)  // related to music
-	AM_RANGE(0x092800, 0x092801) AM_WRITE(AY8910_write_port_0_msb_w		)
-	AM_RANGE(0x092802, 0x092803) AM_READ(AY8910_read_port_0_msb_r) AM_WRITE(AY8910_control_port_0_msb_w	)
+	AM_RANGE(0x092800, 0x092801) AM_WRITE(ay8910_write_port_0_msb_w		)
+	AM_RANGE(0x092802, 0x092803) AM_READ(ay8910_read_port_0_msb_r) AM_WRITE(ay8910_control_port_0_msb_w	)
 	AM_RANGE(0x093802, 0x093803) AM_READ_PORT("IN0")
 	AM_RANGE(0x095000, 0x095fff) AM_RAM AM_BASE((UINT16 **)&stats_ram) AM_SIZE(&stats_ram_size) /* 8 bit */
 	AM_RANGE(0x097000, 0x097001) AM_READ(SMH_NOP)
diff --git a/src/mame/drivers/bogeyman.c b/src/mame/drivers/bogeyman.c
index 0ca729cf9c0..aa240d1c816 100644
--- a/src/mame/drivers/bogeyman.c
+++ b/src/mame/drivers/bogeyman.c
@@ -50,9 +50,9 @@ static WRITE8_HANDLER( bogeyman_8910_control_w )
 	{
 		// bit 4 goes to the 8910 #0 BC1 pin
 		if (last & 0x10)
-			AY8910_control_port_0_w(machine,0,psg_latch);
+			ay8910_control_port_0_w(machine,0,psg_latch);
 		else
-			AY8910_write_port_0_w(machine,0,psg_latch);
+			ay8910_write_port_0_w(machine,0,psg_latch);
 	}
 
 	// bit 7 goes to 8910 #1 BDIR pin
@@ -60,9 +60,9 @@ static WRITE8_HANDLER( bogeyman_8910_control_w )
 	{
 		// bit 6 goes to the 8910 #1 BC1 pin
 		if (last & 0x40)
-			AY8910_control_port_1_w(machine,0,psg_latch);
+			ay8910_control_port_1_w(machine,0,psg_latch);
 		else
-			AY8910_write_port_1_w(machine,0,psg_latch);
+			ay8910_write_port_1_w(machine,0,psg_latch);
 	}
 
 	last = data;
diff --git a/src/mame/drivers/bombjack.c b/src/mame/drivers/bombjack.c
index 265d1a67e5b..2741798747b 100644
--- a/src/mame/drivers/bombjack.c
+++ b/src/mame/drivers/bombjack.c
@@ -167,12 +167,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x11, 0x11) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x11, 0x11) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c
index d8794095831..cbc9a46041b 100644
--- a/src/mame/drivers/boogwing.c
+++ b/src/mame/drivers/boogwing.c
@@ -132,7 +132,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_ROM
 	AM_RANGE(0x100000, 0x100001) AM_NOP
-	AM_RANGE(0x110000, 0x110001) AM_READWRITE(YM2151_status_port_0_r, YM2151_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_READWRITE(ym2151_status_port_0_r, ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_READWRITE(okim6295_status_1_r, okim6295_data_1_w)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/brkthru.c b/src/mame/drivers/brkthru.c
index 39dac530b9c..df5b4555fcb 100644
--- a/src/mame/drivers/brkthru.c
+++ b/src/mame/drivers/brkthru.c
@@ -138,12 +138,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r)
-	AM_RANGE(0x6000, 0x6000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c
index 72738240065..2976be52f44 100644
--- a/src/mame/drivers/btime.c
+++ b/src/mame/drivers/btime.c
@@ -328,10 +328,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x03ff) AM_RAM AM_BASE(&audio_rambase)
 	AM_RANGE(0x0400, 0x0fff) AM_ROM AM_REGION("audio", 0xf400)
-	AM_RANGE(0x2000, 0x2fff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4fff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6fff) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8fff) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2fff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4fff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6fff) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8fff) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xa000, 0xafff) AM_READ(soundlatch_r)
 	AM_RANGE(0xc000, 0xcfff) AM_WRITE(interrupt_enable_w)
 	AM_RANGE(0xf000, 0xffff) AM_ROM
@@ -339,10 +339,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( disco_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x03ff) AM_RAM
-	AM_RANGE(0x4000, 0x4fff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x5000, 0x5fff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6fff) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x7000, 0x7fff) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x4000, 0x4fff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x5000, 0x5fff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6fff) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x7000, 0x7fff) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x8000, 0x8fff) AM_READWRITE(soundlatch_r, SMH_NOP) /* ack ? */
 	AM_RANGE(0xf000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/btoads.c b/src/mame/drivers/btoads.c
index 862911fd663..b21cfaba6f5 100644
--- a/src/mame/drivers/btoads.c
+++ b/src/mame/drivers/btoads.c
@@ -171,7 +171,7 @@ static WRITE8_HANDLER( bsmt2000_port_w )
 {
 	UINT16 reg = offset >> 8;
 	UINT16 val = ((offset & 0xff) << 8) | data;
-	BSMT2000_data_0_w(machine, reg, val, 0xffff);
+	bsmt2000_data_0_w(machine, reg, val, 0xffff);
 }
 
 
diff --git a/src/mame/drivers/bublbobl.c b/src/mame/drivers/bublbobl.c
index 937ef228b1d..ef78d3abe2b 100644
--- a/src/mame/drivers/bublbobl.c
+++ b/src/mame/drivers/bublbobl.c
@@ -305,10 +305,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
-	AM_RANGE(0x9000, 0x9000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0xa000, 0xa000) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITENOP
 	AM_RANGE(0xb001, 0xb001) AM_WRITE(bublbobl_sh_nmi_enable_w) AM_READNOP
 	AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w)
@@ -397,8 +397,8 @@ static ADDRESS_MAP_START( tokio_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9800, 0x9800) AM_READNOP	// ???
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(bublbobl_sh_nmi_disable_w)
 	AM_RANGE(0xa800, 0xa800) AM_WRITE(bublbobl_sh_nmi_enable_w)
-	AM_RANGE(0xb000, 0xb000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xb001, 0xb001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0xb000, 0xb000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xb001, 0xb001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0xe000, 0xffff) AM_ROM	// space for diagnostic ROM?
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c
index 1229ad83c16..7748497364a 100644
--- a/src/mame/drivers/buggychl.c
+++ b/src/mame/drivers/buggychl.c
@@ -188,10 +188,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x4800, 0x4800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4801, 0x4801) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4802, 0x4802) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4803, 0x4803) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x4800, 0x4800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4801, 0x4801) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4802, 0x4802) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4803, 0x4803) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x4810, 0x481d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0x4820, 0x4820) AM_WRITE(SMH_RAM)	/* VOL/BAL   for the 7630 on the MSM5232 output */
 	AM_RANGE(0x4830, 0x4830) AM_WRITE(SMH_RAM)	/* TRBL/BASS for the 7630 on the MSM5232 output  */
diff --git a/src/mame/drivers/bwing.c b/src/mame/drivers/bwing.c
index 1beeb464f8d..d5735753969 100644
--- a/src/mame/drivers/bwing.c
+++ b/src/mame/drivers/bwing.c
@@ -225,12 +225,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bwp3_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x0200, 0x0200) AM_WRITE(DAC_0_signed_data_w)
+	AM_RANGE(0x0200, 0x0200) AM_WRITE(dac_0_signed_data_w)
 	AM_RANGE(0x1000, 0x1000) AM_WRITE(bwp3_nmiack_w)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(bwp3_nmimask_w)
 	AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM) AM_BASE(&bwp3_rombase) AM_SIZE(&bwp3_romsize)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/cabal.c b/src/mame/drivers/cabal.c
index 3b59405d50d..bfc95e5c369 100644
--- a/src/mame/drivers/cabal.c
+++ b/src/mame/drivers/cabal.c
@@ -188,8 +188,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4002, 0x4002) AM_WRITE(seibu_rst10_ack_w)
 	AM_RANGE(0x4003, 0x4003) AM_WRITE(seibu_rst18_ack_w)
 	AM_RANGE(0x4005, 0x4006) AM_WRITE(seibu_adpcm_adr_1_w)
-	AM_RANGE(0x4008, 0x4008) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x4009, 0x4009) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x4008, 0x4008) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x4009, 0x4009) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x4010, 0x4011) AM_READ(seibu_soundlatch_r)
 	AM_RANGE(0x4012, 0x4012) AM_READ(seibu_main_data_pending_r)
 	AM_RANGE(0x4013, 0x4013) AM_READ_PORT("COIN")
@@ -211,8 +211,8 @@ static ADDRESS_MAP_START( cabalbl_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4008, 0x4008) AM_READ(cabalbl_snd2_r)
 	AM_RANGE(0x400a, 0x400a) AM_READ(cabalbl_snd1_r)
 	AM_RANGE(0x400c, 0x400c) AM_WRITE(soundlatch2_w)
-	AM_RANGE(0x400e, 0x400e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x400f, 0x400f) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x400e, 0x400e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x400f, 0x400f) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x6000, 0x6000) AM_WRITE(SMH_NOP)  /* ??? */
 	AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/calomega.c b/src/mame/drivers/calomega.c
index 83411413375..5718e81d2e1 100644
--- a/src/mame/drivers/calomega.c
+++ b/src/mame/drivers/calomega.c
@@ -755,8 +755,8 @@ static WRITE8_HANDLER( lamps_b_w )
 static ADDRESS_MAP_START( sys903_map, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0x3fff)
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-	AM_RANGE(0x0840, 0x0840) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x0841, 0x0841) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x0840, 0x0840) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x0841, 0x0841) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x0880, 0x0880) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x08c4, 0x08c7) AM_READWRITE(pia_0_r, pia_0_w)
@@ -771,8 +771,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( s903mod_map, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0x3fff)
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-	AM_RANGE(0x0840, 0x0840) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x0841, 0x0841) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x0840, 0x0840) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x0841, 0x0841) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x0880, 0x0880) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x0881, 0x0881) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x08c4, 0x08c7) AM_READWRITE(pia_0_r, pia_0_w)
@@ -785,8 +785,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sys905_map, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0x7fff)
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-	AM_RANGE(0x1040, 0x1040) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x1041, 0x1041) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x1040, 0x1040) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x1041, 0x1041) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x1080, 0x1080) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x1081, 0x1081) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x10c4, 0x10c7) AM_READWRITE(pia_0_r, pia_0_w)
diff --git a/src/mame/drivers/calorie.c b/src/mame/drivers/calorie.c
index 2340c9faaf8..75fa1591280 100644
--- a/src/mame/drivers/calorie.c
+++ b/src/mame/drivers/calorie.c
@@ -225,10 +225,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( calorie_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x11, 0x11) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x11, 0x11) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	// 3rd ?
 	AM_RANGE(0x00, 0xff) AM_WRITE(bogus_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/capbowl.c b/src/mame/drivers/capbowl.c
index 6eee151bc35..becdeda2d8b 100644
--- a/src/mame/drivers/capbowl.c
+++ b/src/mame/drivers/capbowl.c
@@ -276,10 +276,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
-	AM_RANGE(0x1000, 0x1000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x2000, 0x2000) AM_WRITENOP  				/* Not hooked up according to the schematics */
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x7000, 0x7000) AM_READ(soundlatch_r)
 	AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/carjmbre.c b/src/mame/drivers/carjmbre.c
index 6042cce7c1c..a23161c634b 100644
--- a/src/mame/drivers/carjmbre.c
+++ b/src/mame/drivers/carjmbre.c
@@ -100,11 +100,11 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( carjmbre_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP)				//?? written on init/0xff sound command reset
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x21, 0x21) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x21, 0x21) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x22, 0x22) AM_WRITE(SMH_NOP)				//?? written before and after 0x21 with same value
-	AM_RANGE(0x30, 0x30) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x31, 0x31) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x30, 0x30) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x31, 0x31) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x32, 0x32) AM_WRITE(SMH_NOP)				//?? written before and after 0x31 with same value
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/carrera.c b/src/mame/drivers/carrera.c
index 3beaa3d9f1a..536f862aea1 100644
--- a/src/mame/drivers/carrera.c
+++ b/src/mame/drivers/carrera.c
@@ -77,8 +77,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) // ?
 
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c
index c8f970dae2a..60f0ab6115d 100644
--- a/src/mame/drivers/cave.c
+++ b/src/mame/drivers/cave.c
@@ -275,15 +275,15 @@ static WRITE16_HANDLER( cave_sound_w )
 {
 	if (ACCESSING_BITS_0_7)
 	{
-		if (offset)	YMZ280B_data_0_w     (machine, offset, data & 0xff);
-		else		YMZ280B_register_0_w (machine, offset, data & 0xff);
+		if (offset)	ymz280b_data_0_w     (machine, offset, data & 0xff);
+		else		ymz280b_register_0_w (machine, offset, data & 0xff);
 	}
 }
 
 /* Handles reads from the YMZ280B */
 static READ16_HANDLER( cave_sound_r )
 {
-	return YMZ280B_status_0_r(machine,offset);
+	return ymz280b_status_0_r(machine,offset);
 }
 
 
@@ -1206,16 +1206,16 @@ static ADDRESS_MAP_START( hotdogst_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r			)	// From Main CPU
 	AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r			)	//
-	AM_RANGE(0x50, 0x50) AM_READ(YM2203_status_port_0_r	)	// YM2203
-	AM_RANGE(0x51, 0x51) AM_READ(YM2203_read_port_0_r		)	//
+	AM_RANGE(0x50, 0x50) AM_READ(ym2203_status_port_0_r	)	// YM2203
+	AM_RANGE(0x51, 0x51) AM_READ(ym2203_read_port_0_r		)	//
 	AM_RANGE(0x60, 0x60) AM_READ(okim6295_status_0_r		)	// M6295
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hotdogst_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(hotdogst_rombank_w		)	// ROM bank
-	AM_RANGE(0x50, 0x50) AM_WRITE(YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE(0x51, 0x51) AM_WRITE(YM2203_write_port_0_w		)	//
+	AM_RANGE(0x50, 0x50) AM_WRITE(ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE(0x51, 0x51) AM_WRITE(ym2203_write_port_0_w		)	//
 	AM_RANGE(0x60, 0x60) AM_WRITE(okim6295_data_0_w			)	// M6295
 	AM_RANGE(0x70, 0x70) AM_WRITE(hotdogst_okibank_w		)	// Samples bank
 ADDRESS_MAP_END
@@ -1251,15 +1251,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( mazinger_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r			)	// From Main CPU
-	AM_RANGE(0x52, 0x52) AM_READ(YM2203_status_port_0_r	)	// YM2203
+	AM_RANGE(0x52, 0x52) AM_READ(ym2203_status_port_0_r	)	// YM2203
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mazinger_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(mazinger_rombank_w		)	// ROM bank
 	AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w			)	// To Main CPU
-	AM_RANGE(0x50, 0x50) AM_WRITE(YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE(0x51, 0x51) AM_WRITE(YM2203_write_port_0_w		)	//
+	AM_RANGE(0x50, 0x50) AM_WRITE(ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE(0x51, 0x51) AM_WRITE(ym2203_write_port_0_w		)	//
 	AM_RANGE(0x70, 0x70) AM_WRITE(okim6295_data_0_w			)	// M6295
 	AM_RANGE(0x74, 0x74) AM_WRITE(hotdogst_okibank_w		)	// Samples bank
 ADDRESS_MAP_END
@@ -1313,14 +1313,14 @@ static ADDRESS_MAP_START( metmqstr_sound_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(soundflags_r				)	// Communication
 	AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r			)	// From Main CPU
 	AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r			)	//
-	AM_RANGE(0x51, 0x51) AM_READ(YM2151_status_port_0_r	)	// YM2151
+	AM_RANGE(0x51, 0x51) AM_READ(ym2151_status_port_0_r	)	// YM2151
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( metmqstr_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(metmqstr_rombank_w		)	// Rom Bank
-	AM_RANGE(0x50, 0x50) AM_WRITE(YM2151_register_port_0_w	)	// YM2151
-	AM_RANGE(0x51, 0x51) AM_WRITE(YM2151_data_port_0_w		)	//
+	AM_RANGE(0x50, 0x50) AM_WRITE(ym2151_register_port_0_w	)	// YM2151
+	AM_RANGE(0x51, 0x51) AM_WRITE(ym2151_data_port_0_w		)	//
 	AM_RANGE(0x60, 0x60) AM_WRITE(okim6295_data_0_w			)	// M6295 #0
 	AM_RANGE(0x70, 0x70) AM_WRITE(metmqstr_okibank0_w		)	// Samples Bank #0
 	AM_RANGE(0x80, 0x80) AM_WRITE(okim6295_data_1_w			)	// M6295 #1
@@ -1357,8 +1357,8 @@ static ADDRESS_MAP_START( pwrinst2_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_READ(okim6295_status_0_r		)	// M6295
 	AM_RANGE(0x08, 0x08) AM_READ(okim6295_status_1_r		)	//
-	AM_RANGE(0x40, 0x40) AM_READ(YM2203_status_port_0_r	)	// YM2203
-	AM_RANGE(0x41, 0x41) AM_READ(YM2203_read_port_0_r		)	//
+	AM_RANGE(0x40, 0x40) AM_READ(ym2203_status_port_0_r	)	// YM2203
+	AM_RANGE(0x41, 0x41) AM_READ(ym2203_read_port_0_r		)	//
 	AM_RANGE(0x60, 0x60) AM_READ(soundlatch_hi_r			)	// From Main CPU
 	AM_RANGE(0x70, 0x70) AM_READ(soundlatch_lo_r			)	//
 ADDRESS_MAP_END
@@ -1368,8 +1368,8 @@ static ADDRESS_MAP_START( pwrinst2_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_WRITE(okim6295_data_0_w			)	// M6295
 	AM_RANGE(0x08, 0x08) AM_WRITE(okim6295_data_1_w			)	//
 	AM_RANGE(0x10, 0x17) AM_WRITE(NMK112_okibank_w			)	// Samples bank
-	AM_RANGE(0x40, 0x40) AM_WRITE(YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE(0x41, 0x41) AM_WRITE(YM2203_write_port_0_w		)	//
+	AM_RANGE(0x40, 0x40) AM_WRITE(ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE(0x41, 0x41) AM_WRITE(ym2203_write_port_0_w		)	//
 //  AM_RANGE(0x50, 0x50) AM_WRITE(SMH_NOP      )   // ?? volume
 //  AM_RANGE(0x51, 0x51) AM_WRITE(SMH_NOP      )   // ?? volume
 	AM_RANGE(0x80, 0x80) AM_WRITE(pwrinst2_rombank_w		)	// ROM bank
@@ -1436,7 +1436,7 @@ static ADDRESS_MAP_START( sailormn_sound_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(soundflags_r				)	// Communication
 	AM_RANGE(0x30, 0x30) AM_READ(soundlatch_lo_r			)	// From Main CPU
 	AM_RANGE(0x40, 0x40) AM_READ(soundlatch_hi_r			)	//
-	AM_RANGE(0x51, 0x51) AM_READ(YM2151_status_port_0_r	)	// YM2151
+	AM_RANGE(0x51, 0x51) AM_READ(ym2151_status_port_0_r	)	// YM2151
 	AM_RANGE(0x60, 0x60) AM_READ(okim6295_status_0_r		)	// M6295 #0
 	AM_RANGE(0x80, 0x80) AM_READ(okim6295_status_1_r		)	// M6295 #1
 ADDRESS_MAP_END
@@ -1445,8 +1445,8 @@ static ADDRESS_MAP_START( sailormn_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(sailormn_rombank_w		)	// Rom Bank
 	AM_RANGE(0x10, 0x10) AM_WRITE(soundlatch_ack_w			)	// To Main CPU
-	AM_RANGE(0x50, 0x50) AM_WRITE(YM2151_register_port_0_w	)	// YM2151
-	AM_RANGE(0x51, 0x51) AM_WRITE(YM2151_data_port_0_w		)	//
+	AM_RANGE(0x50, 0x50) AM_WRITE(ym2151_register_port_0_w	)	// YM2151
+	AM_RANGE(0x51, 0x51) AM_WRITE(ym2151_data_port_0_w		)	//
 	AM_RANGE(0x60, 0x60) AM_WRITE(okim6295_data_0_w			)	// M6295 #0
 	AM_RANGE(0x70, 0x70) AM_WRITE(sailormn_okibank0_w		)	// Samples Bank #0
 	AM_RANGE(0x80, 0x80) AM_WRITE(okim6295_data_1_w			)	// M6295 #1
@@ -1956,7 +1956,7 @@ static MACHINE_RESET( cave )
 		((UINT8 *)eeprom_get_data_pointer(NULL,NULL))[cave_region_byte] =  input_port_read(machine, "EEPROM");
 }
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	sound_irq_gen
 };
diff --git a/src/mame/drivers/cbasebal.c b/src/mame/drivers/cbasebal.c
index 54c1e878a9a..74c170bedf4 100644
--- a/src/mame/drivers/cbasebal.c
+++ b/src/mame/drivers/cbasebal.c
@@ -145,8 +145,8 @@ static ADDRESS_MAP_START( cbasebal_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x02, 0x02) AM_WRITE(eeprom_clock_w)
 	AM_RANGE(0x03, 0x03) AM_WRITE(eeprom_serial_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(okim6295_data_0_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x07, 0x07) AM_WRITE(YM2413_data_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ym2413_data_port_0_w)
 	AM_RANGE(0x08, 0x09) AM_WRITE(cbasebal_scrollx_w)
 	AM_RANGE(0x0a, 0x0b) AM_WRITE(cbasebal_scrolly_w)
 	AM_RANGE(0x10, 0x10) AM_READ_PORT("P1")
diff --git a/src/mame/drivers/cbuster.c b/src/mame/drivers/cbuster.c
index 8de3fc1a0de..b1ac138e76e 100644
--- a/src/mame/drivers/cbuster.c
+++ b/src/mame/drivers/cbuster.c
@@ -160,10 +160,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -172,18 +172,18 @@ static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
 	case 0:
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 		break;
 	}
 }
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x100000, 0x100001) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c
index 739948d978a..c14a52258b1 100644
--- a/src/mame/drivers/cclimber.c
+++ b/src/mame/drivers/cclimber.c
@@ -380,9 +380,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cclimber_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0c, 0x0c) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0c, 0x0c) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( yamato_portmap, ADDRESS_SPACE_IO, 8 )
@@ -407,18 +407,18 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( swimmer_audio_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( yamato_audio_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x04, 0x04) AM_READ(yamato_p0_r)	/* ??? */
 	AM_RANGE(0x08, 0x08) AM_READ(yamato_p1_r)	/* ??? */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 1837ff4a092..54aaba82435 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -649,15 +649,15 @@ static WRITE8_HANDLER( bullsdrt_coin_count_w )
 
 static WRITE8_HANDLER( caterplr_AY8910_w )
 {
-	AY8910_control_port_0_w(machine, 0, offset);
-	AY8910_write_port_0_w(machine, 0, data);
+	ay8910_control_port_0_w(machine, 0, offset);
+	ay8910_write_port_0_w(machine, 0, data);
 }
 
 
 static READ8_HANDLER( caterplr_AY8910_r )
 {
-	AY8910_control_port_0_w(machine, 0, offset);
-	return AY8910_read_port_0_r(machine, 0);
+	ay8910_control_port_0_w(machine, 0, offset);
+	return ay8910_read_port_0_r(machine, 0);
 }
 
 
@@ -704,8 +704,8 @@ static ADDRESS_MAP_START( centipdb_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0c01, 0x0c01) AM_MIRROR(0x4000) AM_READ_PORT("IN1")		/* IN1 */
 	AM_RANGE(0x0c02, 0x0c02) AM_MIRROR(0x4000) AM_READ(centiped_IN2_r)	/* IN2 */
 	AM_RANGE(0x0c03, 0x0c03) AM_MIRROR(0x4000) AM_READ_PORT("IN3")		/* IN3 */
-	AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x4000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x4000) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x4000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_MIRROR(0x4000) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
 	AM_RANGE(0x1400, 0x140f) AM_MIRROR(0x4000) AM_WRITE(centiped_paletteram_w) AM_BASE(&paletteram)
 	AM_RANGE(0x1600, 0x163f) AM_MIRROR(0x4000) AM_WRITE(atari_vg_earom_w)
 	AM_RANGE(0x1680, 0x1680) AM_MIRROR(0x4000) AM_WRITE(atari_vg_earom_ctrl_w)
@@ -1942,8 +1942,8 @@ static DRIVER_INIT( caterplr )
 
 static DRIVER_INIT( magworm )
 {
-	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x1001, 0x1001, 0, 0, AY8910_control_port_0_w);
-	memory_install_readwrite8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x1003, 0x1003, 0, 0, AY8910_read_port_0_r, AY8910_write_port_0_w);
+	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x1001, 0x1001, 0, 0, ay8910_control_port_0_w);
+	memory_install_readwrite8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x1003, 0x1003, 0, 0, ay8910_read_port_0_r, ay8910_write_port_0_w);
 }
 
 
diff --git a/src/mame/drivers/chaknpop.c b/src/mame/drivers/chaknpop.c
index d35506decd5..9b8944c6ed6 100644
--- a/src/mame/drivers/chaknpop.c
+++ b/src/mame/drivers/chaknpop.c
@@ -44,8 +44,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8800, 0x8800) AM_READ(chaknpop_mcu_portA_r)
 	AM_RANGE(0x8801, 0x8801) AM_READ(chaknpop_mcu_portB_r)
 	AM_RANGE(0x8802, 0x8802) AM_READ(chaknpop_mcu_portC_r)
-	AM_RANGE(0x8805, 0x8805) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x8807, 0x8807) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x8805, 0x8805) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x8807, 0x8807) AM_READ(ay8910_read_port_1_r)
 	AM_RANGE(0x8808, 0x8808) AM_READ_PORT("DSWC")
 	AM_RANGE(0x8809, 0x8809) AM_READ_PORT("P1")
 	AM_RANGE(0x880a, 0x880a) AM_READ_PORT("SYSTEM")
@@ -64,10 +64,10 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8800, 0x8800) AM_WRITE(chaknpop_mcu_portA_w)
 	AM_RANGE(0x8801, 0x8801) AM_WRITE(chaknpop_mcu_portB_w)
 	AM_RANGE(0x8802, 0x8802) AM_WRITE(chaknpop_mcu_portC_w)
-	AM_RANGE(0x8804, 0x8804) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8805, 0x8805) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8806, 0x8806) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8807, 0x8807) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x8804, 0x8804) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8805, 0x8805) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8806, 0x8806) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8807, 0x8807) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x880c, 0x880c) AM_WRITE(chaknpop_gfxmode_w)
 	AM_RANGE(0x880D, 0x880D) AM_WRITE(coinlock_w)			// coin lock out
 	AM_RANGE(0x9000, 0x93ff) AM_WRITE(chaknpop_txram_w) AM_BASE(&chaknpop_txram)
diff --git a/src/mame/drivers/champbas.c b/src/mame/drivers/champbas.c
index ec0ac8e6597..5f0a959b505 100644
--- a/src/mame/drivers/champbas.c
+++ b/src/mame/drivers/champbas.c
@@ -149,13 +149,13 @@ static MACHINE_START( exctsccr )
 // Champion Baseball has only one DAC
 static WRITE8_HANDLER( champbas_dac_w )
 {
-	DAC_signed_data_w(0, data << 2);
+	dac_signed_data_w(0, data << 2);
 }
 
 // Exciting Soccer has two
 static WRITE8_HANDLER( exctsccr_DAC_data_w )
 {
-	DAC_signed_data_w(offset, data << 2);
+	dac_signed_data_w(offset, data << 2);
 }
 
 
@@ -217,8 +217,8 @@ AB 1010_1011
 static ADDRESS_MAP_START( talbot_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x5fff) AM_ROM
 	AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) /* MCU shared RAM */
-	AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x7001, 0x7001) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram)
 	AM_RANGE(0x8800, 0x8fef) AM_RAM
 	AM_RANGE(0x8ff0, 0x8fff) AM_RAM AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
@@ -245,8 +245,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( champbas_main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x5fff) AM_ROM
 	AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1)
-	AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x7001, 0x7001) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x7800, 0x7fff) AM_ROM	// champbb2 only
 	AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram)
 	AM_RANGE(0x8800, 0x8fef) AM_RAM
@@ -278,8 +278,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( exctsccb_main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x5fff) AM_ROM
 //  AM_RANGE(0x6000, 0x63ff) AM_RAM AM_SHARE(1) // MCU not used (though it's present on the board)
-	AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x7001, 0x7001) AM_WRITE(ay8910_control_port_0_w)
 //  AM_RANGE(0x7800, 0x7fff) AM_ROM // champbb2 only
 	AM_RANGE(0x8000, 0x87ff) AM_RAM_WRITE(champbas_bg_videoram_w) AM_BASE(&champbas_bg_videoram)
 	AM_RANGE(0x8800, 0x8fff) AM_RAM AM_BASE(&spriteram_2) /* ??? */
@@ -349,14 +349,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( exctsccr_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK( 0x00ff )
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x86, 0x86) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x87, 0x87) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8a, 0x8a) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0x8b, 0x8b) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_write_port_3_w)
-	AM_RANGE(0x8f, 0x8f) AM_WRITE(AY8910_control_port_3_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x86, 0x86) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x87, 0x87) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8a, 0x8a) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0x8b, 0x8b) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x8e, 0x8e) AM_WRITE(ay8910_write_port_3_w)
+	AM_RANGE(0x8f, 0x8f) AM_WRITE(ay8910_control_port_3_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/champbwl.c b/src/mame/drivers/champbwl.c
index f72076cbb5f..459c387e3ba 100644
--- a/src/mame/drivers/champbwl.c
+++ b/src/mame/drivers/champbwl.c
@@ -323,7 +323,7 @@ static GFXDECODE_START( champbwl )
 	GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 32 )
 GFXDECODE_END
 
-static const struct x1_010_interface champbwl_sound_intf =
+static const x1_010_interface champbwl_sound_intf =
 {
 	0x0000		/* address */
 };
diff --git a/src/mame/drivers/changela.c b/src/mame/drivers/changela.c
index 9b9466d890f..dfffbfddf4c 100644
--- a/src/mame/drivers/changela.c
+++ b/src/mame/drivers/changela.c
@@ -266,8 +266,8 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(changela_mem_device_r)			/* RAM4 (River Bed RAM); RAM5 (Tree RAM) */
 
-	AM_RANGE(0xd000, 0xd000) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xd010, 0xd010) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0xd000, 0xd000) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xd010, 0xd010) AM_READ(ay8910_read_port_1_r)
 
 	/* LS139 - U24 */
 	AM_RANGE(0xd024, 0xd024) AM_READ(changela_24_r)
@@ -298,10 +298,10 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xca00, 0xca00) AM_WRITE(changela_slope_rom_addr_hi_w)
 	AM_RANGE(0xcb00, 0xcb00) AM_WRITE(changela_slope_rom_addr_lo_w)
 
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xd010, 0xd010) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xd011, 0xd011) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xd010, 0xd010) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xd011, 0xd011) AM_WRITE(ay8910_write_port_1_w)
 
 	/* LS259 - U44 */
 	AM_RANGE(0xd020, 0xd020) AM_WRITE(changela_collision_reset_0)
diff --git a/src/mame/drivers/cherrym.c b/src/mame/drivers/cherrym.c
index c886939a7b2..3586bd7dacc 100644
--- a/src/mame/drivers/cherrym.c
+++ b/src/mame/drivers/cherrym.c
@@ -140,9 +140,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cm_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x04, 0x04) AM_READ_PORT("PLAYER")
 	AM_RANGE(0x05, 0x05) AM_READ_PORT("COIN")
 	AM_RANGE(0x06, 0x06) AM_READ_PORT("TEST")
diff --git a/src/mame/drivers/cherrym2.c b/src/mame/drivers/cherrym2.c
index 52459bb6464..0a7e131227d 100644
--- a/src/mame/drivers/cherrym2.c
+++ b/src/mame/drivers/cherrym2.c
@@ -74,9 +74,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cm_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-  AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
-  AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-  AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
+  AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
+  AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+  AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
   AM_RANGE(0x04, 0x04) AM_READ_PORT("PLAYER")
   AM_RANGE(0x09, 0x09) AM_READ_PORT("COIN")
   AM_RANGE(0x0a, 0x0a) AM_READ_PORT("TEST")
diff --git a/src/mame/drivers/chinagat.c b/src/mame/drivers/chinagat.c
index 73e79c30dae..23760f07581 100644
--- a/src/mame/drivers/chinagat.c
+++ b/src/mame/drivers/chinagat.c
@@ -300,8 +300,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -312,17 +312,17 @@ static ADDRESS_MAP_START( ym2203c_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 // 8804 and/or 8805 make a gong sound when the coin goes in
 // but only on the title screen....
 
-	AM_RANGE(0x8800, 0x8800) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2203_write_port_0_w)
 //  AM_RANGE(0x8802, 0x8802) AM_READWRITE(okim6295_data_0_w, okim6295_status_0_r)
 //  AM_RANGE(0x8803, 0x8803) AM_WRITE(okim6295_data_0_w)
-	AM_RANGE(0x8804, 0x8804) AM_READWRITE(YM2203_status_port_1_r,  YM2203_control_port_1_w)
-	AM_RANGE(0x8805, 0x8805) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x8804, 0x8804) AM_READWRITE(ym2203_status_port_1_r,  ym2203_control_port_1_w)
+	AM_RANGE(0x8805, 0x8805) AM_WRITE(ym2203_write_port_1_w)
 //  AM_RANGE(0x8804, 0x8804) AM_WRITE(SMH_RAM)
 //  AM_RANGE(0x8805, 0x8805) AM_WRITE(SMH_RAM)
 
-//  AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-//  AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w)
+//  AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+//  AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2151_data_port_0_w)
 //  AM_RANGE(0x9800, 0x9800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -330,8 +330,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( saiyugb1_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_WRITE(saiyugb1_mcu_command_w)
 	AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/chinsan.c b/src/mame/drivers/chinsan.c
index c1ee1340699..4190f99f720 100644
--- a/src/mame/drivers/chinsan.c
+++ b/src/mame/drivers/chinsan.c
@@ -197,8 +197,8 @@ static ADDRESS_MAP_START( chinsan_io, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_WRITE(chinsan_port00_w)
 	AM_RANGE(0x01, 0x01) AM_READ(chinsan_input_port_0_r)
 	AM_RANGE(0x02, 0x02) AM_READ(chinsan_input_port_1_r)
-	AM_RANGE(0x10, 0x10) AM_READ(YM2203_status_port_0_r) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x11, 0x11) AM_READ(YM2203_read_port_0_r) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_READ(ym2203_status_port_0_r) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x11, 0x11) AM_READ(ym2203_read_port_0_r) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x30, 0x30) AM_WRITE(ctrl_w)	// ROM bank + unknown stuff (input mutliplex?)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c
index 465a4624a16..c56ec4b2895 100644
--- a/src/mame/drivers/chqflag.c
+++ b/src/mame/drivers/chqflag.c
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( chqflag_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)				/* RAM */
 	AM_RANGE(0xa000, 0xa00d) AM_READ(k007232_read_port_0_r)	/* 007232 (chip 1) */
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_1_r)	/* 007232 (chip 2) */
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)	/* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)	/* YM2151 */
 	AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)			/* soundlatch_r */
 	//AM_RANGE(0xe000, 0xe000) AM_READ(SMH_NOP)                /* ??? */
 ADDRESS_MAP_END
@@ -216,8 +216,8 @@ static ADDRESS_MAP_START( chqflag_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xa01c, 0xa01c) AM_WRITE(k007232_extvolume_w)/* extra volume, goes to the 007232 w/ A11 */
 											/* selecting a different latch for the external port */
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_1_w)		/* 007232 (chip 2) */
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)	/* YM2151 */
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)		/* YM2151 */
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)	/* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)		/* YM2151 */
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(SMH_NOP)					/* ??? */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/cidelsa.c b/src/mame/drivers/cidelsa.c
index 4f3f3a542ee..659f1cbff7b 100644
--- a/src/mame/drivers/cidelsa.c
+++ b/src/mame/drivers/cidelsa.c
@@ -93,15 +93,15 @@ static WRITE8_HANDLER( draco_sound_g_w )
 	switch (data)
 	{
 	case 0x01:
-		AY8910_write_port_0_w(machine, 0, state->draco_ay_latch);
+		ay8910_write_port_0_w(machine, 0, state->draco_ay_latch);
 		break;
 
 	case 0x02:
-		state->draco_ay_latch = AY8910_read_port_0_r(machine, 0);
+		state->draco_ay_latch = ay8910_read_port_0_r(machine, 0);
 		break;
 
 	case 0x03:
-		AY8910_control_port_0_w(machine, 0, state->draco_ay_latch);
+		ay8910_control_port_0_w(machine, 0, state->draco_ay_latch);
 		break;
 	}
 }
diff --git a/src/mame/drivers/cischeat.c b/src/mame/drivers/cischeat.c
index 4ca6facf9ec..9b657fcefc2 100644
--- a/src/mame/drivers/cischeat.c
+++ b/src/mame/drivers/cischeat.c
@@ -849,7 +849,7 @@ static ADDRESS_MAP_START( bigrun_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM						)	// ROM
 	AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM						)	// RAM
 	AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r				)	// From Main CPU
-	AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r	)
+	AM_RANGE(0x080002, 0x080003) AM_READ(ym2151_status_port_0_lsb_r	)
 	AM_RANGE(0x0a0000, 0x0a0001) AM_READ(okim6295_status_0_lsb_r		)
 	AM_RANGE(0x0c0000, 0x0c0001) AM_READ(okim6295_status_1_lsb_r		)
 ADDRESS_MAP_END
@@ -859,8 +859,8 @@ static ADDRESS_MAP_START( bigrun_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x0f0000, 0x0fffff) AM_WRITE(SMH_RAM						)	// RAM
 	AM_RANGE(0x040000, 0x040001) AM_WRITE(bigrun_soundbank_w			)	// Sample Banking
 	AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w			)	// To Main CPU
-	AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w	)
-	AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w		)
+	AM_RANGE(0x080000, 0x080001) AM_WRITE(ym2151_register_port_0_lsb_w	)
+	AM_RANGE(0x080002, 0x080003) AM_WRITE(ym2151_data_port_0_lsb_w		)
 	AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(okim6295_data_1_lsb_w			)
 ADDRESS_MAP_END
@@ -883,7 +883,7 @@ static ADDRESS_MAP_START( cischeat_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM						)	// ROM
 	AM_RANGE(0x0f0000, 0x0fffff) AM_READ(SMH_RAM						)	// RAM
 	AM_RANGE(0x060004, 0x060005) AM_READ(soundlatch_word_r				)	// From Main CPU
-	AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r	)
+	AM_RANGE(0x080002, 0x080003) AM_READ(ym2151_status_port_0_lsb_r	)
 	AM_RANGE(0x0a0000, 0x0a0001) AM_READ(okim6295_status_0_lsb_r		)
 	AM_RANGE(0x0c0000, 0x0c0001) AM_READ(okim6295_status_1_lsb_r		)
 ADDRESS_MAP_END
@@ -894,8 +894,8 @@ static ADDRESS_MAP_START( cischeat_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x040002, 0x040003) AM_WRITE(cischeat_soundbank_0_w		)	// Sample Banking
 	AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_1_w		)	// Sample Banking
 	AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w			)	// To Main CPU
-	AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w	)
-	AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w		)
+	AM_RANGE(0x080000, 0x080001) AM_WRITE(ym2151_register_port_0_lsb_w	)
+	AM_RANGE(0x080002, 0x080003) AM_WRITE(ym2151_data_port_0_lsb_w		)
 	AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(okim6295_data_1_lsb_w			)
 ADDRESS_MAP_END
@@ -909,7 +909,7 @@ static ADDRESS_MAP_START( f1gpstar_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM						)	// ROM
 	AM_RANGE(0x0e0000, 0x0fffff) AM_READ(SMH_RAM						)	// RAM              (cischeat: f0000-fffff)
 	AM_RANGE(0x060000, 0x060001) AM_READ(soundlatch_word_r				)	// From Main CPU    (cischeat: 60004)
-	AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r	)
+	AM_RANGE(0x080002, 0x080003) AM_READ(ym2151_status_port_0_lsb_r	)
 	AM_RANGE(0x0a0000, 0x0a0001) AM_READ(okim6295_status_0_lsb_r		)
 	AM_RANGE(0x0c0000, 0x0c0001) AM_READ(okim6295_status_1_lsb_r		)
 ADDRESS_MAP_END
@@ -920,8 +920,8 @@ static ADDRESS_MAP_START( f1gpstar_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x040004, 0x040005) AM_WRITE(cischeat_soundbank_0_w		)	// Sample Banking   (cischeat: 40002)
 	AM_RANGE(0x040008, 0x040009) AM_WRITE(cischeat_soundbank_1_w		)	// Sample Banking   (cischeat: 40004)
 	AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w			)	// To Main CPU      (cischeat: 60002)
-	AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w	)
-	AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w		)
+	AM_RANGE(0x080000, 0x080001) AM_WRITE(ym2151_register_port_0_lsb_w	)
+	AM_RANGE(0x080002, 0x080003) AM_WRITE(ym2151_data_port_0_lsb_w		)
 	AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(okim6295_data_1_lsb_w			)
 ADDRESS_MAP_END
@@ -935,7 +935,7 @@ static ADDRESS_MAP_START( f1gpstr2_sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x03ffff) AM_READ(SMH_ROM						)	// ROM
 	AM_RANGE(0x0e0000, 0x0fffff) AM_READ(SMH_RAM						)	// RAM
 	AM_RANGE(0x060004, 0x060005) AM_READ(soundlatch_word_r				)	// From Main CPU    (f1gpstar: 60000)
-	AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r	)
+	AM_RANGE(0x080002, 0x080003) AM_READ(ym2151_status_port_0_lsb_r	)
 	AM_RANGE(0x0a0000, 0x0a0001) AM_READ(okim6295_status_0_lsb_r		)
 	AM_RANGE(0x0c0000, 0x0c0001) AM_READ(okim6295_status_1_lsb_r		)
 ADDRESS_MAP_END
@@ -947,8 +947,8 @@ static ADDRESS_MAP_START( f1gpstr2_sound_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x040008, 0x040009) AM_WRITE(cischeat_soundbank_1_w		)	// Sample Banking
 	AM_RANGE(0x04000e, 0x04000f) AM_WRITE(SMH_NOP						)	// ? 0              (f1gpstar: no)
 	AM_RANGE(0x060002, 0x060003) AM_WRITE(soundlatch2_word_w			)	// To Main CPU      (f1gpstar: 60000)
-	AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w	)
-	AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w		)
+	AM_RANGE(0x080000, 0x080001) AM_WRITE(ym2151_register_port_0_lsb_w	)
+	AM_RANGE(0x080002, 0x080003) AM_WRITE(ym2151_data_port_0_lsb_w		)
 	AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(okim6295_data_1_lsb_w			)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/citycon.c b/src/mame/drivers/citycon.c
index bc76770723c..6628e275c24 100644
--- a/src/mame/drivers/citycon.c
+++ b/src/mame/drivers/citycon.c
@@ -53,17 +53,17 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM)
-//  AM_RANGE(0x4002, 0x4002) AM_READ(AY8910_read_port_0_r)  /* ?? */
-	AM_RANGE(0x6001, 0x6001) AM_READ(YM2203_read_port_0_r)
+//  AM_RANGE(0x4002, 0x4002) AM_READ(ay8910_read_port_0_r)  /* ?? */
+	AM_RANGE(0x6001, 0x6001) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/cninja.c b/src/mame/drivers/cninja.c
index 10d4dcd9a06..0f05dabb41a 100644
--- a/src/mame/drivers/cninja.c
+++ b/src/mame/drivers/cninja.c
@@ -327,8 +327,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x100000, 0x100001) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
@@ -337,8 +337,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_word_0_w)
-	AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w)
+	AM_RANGE(0x100000, 0x100001) AM_WRITE(ym2203_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
@@ -349,7 +349,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem_mutantf, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
@@ -359,7 +359,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem_mutantf, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
@@ -370,7 +370,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( stoneage_s_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x8801, 0x8801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0x9800, 0x9800) AM_READ(okim6295_status_0_r)
 ADDRESS_MAP_END
@@ -378,8 +378,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( stoneage_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c
index 0f430e31581..e54dab141b3 100644
--- a/src/mame/drivers/cntsteer.c
+++ b/src/mame/drivers/cntsteer.c
@@ -475,10 +475,10 @@ static INTERRUPT_GEN ( sound_interrupt ) { if (!nmimask) cpunum_set_input_line(m
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_RAM
 //  AM_RANGE(0x1000, 0x1000) AM_WRITE(nmiack_w)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(nmimask_w)
 	AM_RANGE(0xe000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 9b5159494ea..f786ed7750c 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -133,8 +133,8 @@ static ADDRESS_MAP_START( quizmstr_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_READ(question_r)
 	AM_RANGE(0x00, 0x03) AM_WRITE(question_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0x48, 0x4b) AM_READWRITE(pia_0_r, pia_0_w)
 	AM_RANGE(0x50, 0x53) AM_READNOP
 	AM_RANGE(0x50, 0x53) AM_WRITENOP
@@ -151,8 +151,8 @@ static ADDRESS_MAP_START( trailblz_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x03) AM_WRITE(question_w)
 	AM_RANGE(0x40, 0x40) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x41, 0x41) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w)
-	AM_RANGE(0x48, 0x48) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x49, 0x49) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x48, 0x48) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x49, 0x49) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0x50, 0x53) AM_READWRITE(pia_0_r, pia_0_w) //?
 	AM_RANGE(0x60, 0x63) AM_READWRITE(pia_1_r, pia_1_w)
 	AM_RANGE(0x70, 0x73) AM_READWRITE(pia_2_r, pia_2_w)
@@ -175,8 +175,8 @@ static ADDRESS_MAP_START( supnudg2_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x68, 0x69) AM_READNOP
 	AM_RANGE(0x68, 0x6b) AM_WRITENOP
 	AM_RANGE(0x6b, 0x6b) AM_READNOP
-	AM_RANGE(0x78, 0x78) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x79, 0x79) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x78, 0x78) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x79, 0x79) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0xc0, 0xc1) AM_READNOP
 	AM_RANGE(0xc0, 0xc3) AM_WRITENOP
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/combatsc.c b/src/mame/drivers/combatsc.c
index 802a616e9ab..1e122c9b16a 100644
--- a/src/mame/drivers/combatsc.c
+++ b/src/mame/drivers/combatsc.c
@@ -241,7 +241,7 @@ static emu_timer *combasc_interleave_timer;
 static READ8_HANDLER ( combasc_YM2203_status_port_0_r )
 {
 	static int boost = 1;
-	int status = YM2203_status_port_0_r(machine,0);
+	int status = ym2203_status_port_0_r(machine,0);
 
 	if (activecpu_get_pc() == 0x334)
 	{
@@ -320,8 +320,8 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)					/* ROM */
 	AM_RANGE(0x8000, 0x87ef) AM_READ(SMH_RAM)					/* RAM */
 	AM_RANGE(0x87f0, 0x87ff) AM_READ(SMH_RAM)					/* ??? */
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)		/* YM 2203 */
-	AM_RANGE(0x9008, 0x9008) AM_READ(YM2203_status_port_0_r)		/* ??? */
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)		/* YM 2203 */
+	AM_RANGE(0x9008, 0x9008) AM_READ(ym2203_status_port_0_r)		/* ??? */
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)				/* soundlatch_r? */
 	AM_RANGE(0x8800, 0xfffb) AM_READ(SMH_ROM)					/* ROM? */
 	AM_RANGE(0xfffc, 0xffff) AM_READ(SMH_RAM)					/* ??? */
@@ -331,8 +331,8 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)				/* ROM */
 	AM_RANGE(0x8000, 0x87ef) AM_WRITE(SMH_RAM)				/* RAM */
 	AM_RANGE(0x87f0, 0x87ff) AM_WRITE(SMH_RAM)				/* ??? */
- 	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)/* YM 2203 */
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)	/* YM 2203 */
+ 	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)/* YM 2203 */
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)	/* YM 2203 */
 	//AM_RANGE(0x9800, 0x9800) AM_WRITE(combasc_unknown_w_1)    /* OKIM5205? */
 	//AM_RANGE(0xa800, 0xa800) AM_WRITE(combasc_unknown_w_2)    /* OKIM5205? */
 	AM_RANGE(0x8800, 0xfffb) AM_WRITE(SMH_ROM)				/* ROM */
@@ -354,8 +354,8 @@ static ADDRESS_MAP_START( combasc_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9000, 0x9000) AM_WRITE(combasc_play_w)			/* upd7759 play voice */
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(upd7759_0_port_w)		/* upd7759 voice select */
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(combasc_voice_reset_w)	/* upd7759 reset? */
- 	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w)/* YM 2203 */
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w)	/* YM 2203 */
+ 	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2203_control_port_0_w)/* YM 2203 */
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2203_write_port_0_w)	/* YM 2203 */
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index d7e68d7dbf3..b38a84ca940 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -86,10 +86,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x47ff) AM_RAM
 	AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 /* Input Ports */
diff --git a/src/mame/drivers/compgolf.c b/src/mame/drivers/compgolf.c
index e3797e8110a..73470fbcf41 100644
--- a/src/mame/drivers/compgolf.c
+++ b/src/mame/drivers/compgolf.c
@@ -58,7 +58,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x3001, 0x3001) AM_READ_PORT("P2")
 	AM_RANGE(0x3002, 0x3002) AM_READ_PORT("DSW1")
 	AM_RANGE(0x3003, 0x3003) AM_READ_PORT("DSW2")
-	AM_RANGE(0x3800, 0x3800) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x3800, 0x3800) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
 ADDRESS_MAP_END
@@ -70,8 +70,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2000, 0x2060) AM_WRITE(SMH_RAM) AM_BASE(&spriteram)
 	AM_RANGE(0x2061, 0x2061) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x3001, 0x3001) AM_WRITE(compgolf_ctrl_w)
-	AM_RANGE(0x3800, 0x3800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x3801, 0x3801) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x3800, 0x3800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x3801, 0x3801) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x4000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/contra.c b/src/mame/drivers/contra.c
index d97fcc3f075..f88bcef5c38 100644
--- a/src/mame/drivers/contra.c
+++ b/src/mame/drivers/contra.c
@@ -108,14 +108,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_READ(soundlatch_r)
-	AM_RANGE(0x2001, 0x2001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x2001, 0x2001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x6000, 0x67ff) AM_READ(SMH_RAM)
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) /* read triggers irq reset and latch read (in the hardware only). */
 	AM_RANGE(0x6000, 0x67ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
diff --git a/src/mame/drivers/coolpool.c b/src/mame/drivers/coolpool.c
index 91848ce3974..4a487796d8a 100644
--- a/src/mame/drivers/coolpool.c
+++ b/src/mame/drivers/coolpool.c
@@ -403,7 +403,7 @@ static WRITE16_HANDLER( dsp_romaddr_w )
 
 static WRITE16_HANDLER( dsp_dac_w )
 {
-	DAC_signed_data_16_w(0, (INT16)(data << 4) + 0x8000);
+	dac_signed_data_16_w(0, (INT16)(data << 4) + 0x8000);
 }
 
 
diff --git a/src/mame/drivers/cop01.c b/src/mame/drivers/cop01.c
index 4c486bd5007..9d2d286ba22 100644
--- a/src/mame/drivers/cop01.c
+++ b/src/mame/drivers/cop01.c
@@ -167,12 +167,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 /* this just gets some garbage out of the YM3526 */
@@ -186,8 +186,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mightguy_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_WRITE(SMH_NOP)	/* 1412M2? */
 	AM_RANGE(0x03, 0x03) AM_WRITE(SMH_NOP)	/* 1412M2? */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c
index c335fe25377..90fe47090a1 100644
--- a/src/mame/drivers/cosmic.c
+++ b/src/mame/drivers/cosmic.c
@@ -113,7 +113,7 @@ static WRITE8_HANDLER( panic_sound_output_w )
 					sample_stop(4);
 	  			 break;
 
-        case 10: DAC_data_w(0, data); break;				/* Bonus */
+        case 10: dac_data_w(0, data); break;				/* Bonus */
 		case 15: if (data) sample_start(0, 6, 0); break;	/* Player Die */
 		case 16: if (data) sample_start(5, 7, 0); break;	/* Enemy Laugh */
         case 17: if (data) sample_start(0, 10, 0); break;	/* Coin - Not triggered by software */
@@ -155,7 +155,7 @@ static WRITE8_HANDLER( cosmicg_output_w )
 		/* as other cosmic series games, but it never seems to */
 		/* be used for anything. It is implemented for sake of */
 		/* completness. Maybe it plays a tune if you win ?     */
-		case 1:  DAC_data_w(0, -data); break;
+		case 1:  dac_data_w(0, -data); break;
 		case 2:  if (data) sample_start (0, march_select, 0); break;	/* March Sound */
 		case 3:  march_select = (march_select & 0xfe) | data; break;
         case 4:  march_select = (march_select & 0xfd) | (data << 1); break;
@@ -382,7 +382,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( magspot_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x2fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x401f) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
-	AM_RANGE(0x4800, 0x4800) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x4800, 0x4800) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x480c, 0x480d) AM_WRITE(cosmic_color_register_w)
 	AM_RANGE(0x480f, 0x480f) AM_WRITE(flip_screen_w)
 	AM_RANGE(0x6000, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&videoram) AM_SIZE(&videoram_size)
@@ -1404,7 +1404,7 @@ static DRIVER_INIT( nomnlnd )
 	memory_install_read8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x5001, 0, 0, nomnlnd_port_0_1_r);
 	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4800, 0, 0, SMH_NOP);
 	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x4807, 0x4807, 0, 0, cosmic_background_enable_w);
-	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x480a, 0x480a, 0, 0, DAC_0_data_w);
+	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_PROGRAM, 0x480a, 0x480a, 0, 0, dac_0_data_w);
 }
 
 
diff --git a/src/mame/drivers/couple.c b/src/mame/drivers/couple.c
index 2f4b45de9b8..493ce7124c8 100644
--- a/src/mame/drivers/couple.c
+++ b/src/mame/drivers/couple.c
@@ -164,8 +164,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( merit_io, ADDRESS_SPACE_IO, 8 )
 //  ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0xc00c, 0xc00c) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc10c, 0xc10c) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc00c, 0xc00c) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc10c, 0xc10c) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static PALETTE_INIT( couple )
diff --git a/src/mame/drivers/cowrace.c b/src/mame/drivers/cowrace.c
index 1001e660b60..8788fff3bdd 100644
--- a/src/mame/drivers/cowrace.c
+++ b/src/mame/drivers/cowrace.c
@@ -105,8 +105,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( io_map_sound_cowrace, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_READWRITE(YM2203_read_port_0_r,YM2203_write_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(YM2203_control_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_READWRITE(ym2203_read_port_0_r,ym2203_write_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ym2203_control_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 5a04fdb0a06..6441991c9fe 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -548,8 +548,8 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
 	AM_RANGE(0xd000, 0xd7ff) AM_RAM
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xf002, 0xf002) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xf004, 0xf004) AM_WRITE(cps1_snd_bankswitch_w)
 	AM_RANGE(0xf006, 0xf006) AM_WRITE(cps1_oki_pin7_w) /* controls pin 7 of OKI chip */
diff --git a/src/mame/drivers/crgolf.c b/src/mame/drivers/crgolf.c
index a8dccd3e255..b477e44cbaf 100644
--- a/src/mame/drivers/crgolf.c
+++ b/src/mame/drivers/crgolf.c
@@ -257,8 +257,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xc002, 0xc002) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xe000, 0xe000) AM_READWRITE(switch_input_r, switch_input_select_w)
 	AM_RANGE(0xe001, 0xe001) AM_READWRITE(analog_input_r, unknown_w)
diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c
index 59c695635a3..196a643212c 100644
--- a/src/mame/drivers/crimfght.c
+++ b/src/mame/drivers/crimfght.c
@@ -82,7 +82,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( crimfght_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)				/* ROM 821l01.h4 */
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)				/* RAM */
-	AM_RANGE(0xa001, 0xa001) AM_READ(YM2151_status_port_0_r)	/* YM2151 */
+	AM_RANGE(0xa001, 0xa001) AM_READ(ym2151_status_port_0_r)	/* YM2151 */
 	AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r)			/* soundlatch_r */
 	AM_RANGE(0xe000, 0xe00d) AM_READ(k007232_read_port_0_r)	/* 007232 registers */
 ADDRESS_MAP_END
@@ -90,8 +90,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( crimfght_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)					/* ROM 821l01.h4 */
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)					/* RAM */
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w)	/* YM2151 */
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2151_data_port_0_w)		/* YM2151 */
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2151_register_port_0_w)	/* YM2151 */
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2151_data_port_0_w)		/* YM2151 */
 	AM_RANGE(0xe000, 0xe00d) AM_WRITE(k007232_write_port_0_w)		/* 007232 registers */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/crospang.c b/src/mame/drivers/crospang.c
index dd2da702783..de06b2bc161 100644
--- a/src/mame/drivers/crospang.c
+++ b/src/mame/drivers/crospang.c
@@ -136,15 +136,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( crospang_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0x02, 0x02) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( crospang_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/crshrace.c b/src/mame/drivers/crshrace.c
index 9a46ee062a3..8994cf94800 100644
--- a/src/mame/drivers/crshrace.c
+++ b/src/mame/drivers/crshrace.c
@@ -234,18 +234,18 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
-	AM_RANGE(0x08, 0x08) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x0a, 0x0a) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x08, 0x08) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x0a, 0x0a) AM_READ(ym2610_status_port_0_b_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(crshrace_sh_bankswitch_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(pending_command_clear_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/crystal.c b/src/mame/drivers/crystal.c
index 7b4657f99fc..ad7eeefdc16 100644
--- a/src/mame/drivers/crystal.c
+++ b/src/mame/drivers/crystal.c
@@ -515,7 +515,7 @@ static ADDRESS_MAP_START( crystal_mem, ADDRESS_SPACE_PROGRAM, 32 )
 	AM_RANGE(0x03000000, 0x0300ffff) AM_RAM AM_BASE(&vidregs)
 	AM_RANGE(0x03800000, 0x03ffffff) AM_RAM AM_BASE(&textureram)
 	AM_RANGE(0x04000000, 0x047fffff) AM_RAM AM_BASE(&frameram)
-	AM_RANGE(0x04800000, 0x04800fff) AM_READ(VR0_Snd_Read) AM_WRITE(VR0_Snd_Write)
+	AM_RANGE(0x04800000, 0x04800fff) AM_READ(vr0_snd_read) AM_WRITE(vr0_snd_write)
 
 	AM_RANGE(0x05000000, 0x05000003) AM_READ(FlashCmd_r) AM_WRITE(FlashCmd_w)
 	AM_RANGE(0x05000000, 0x05ffffff) AM_READ(SMH_BANK1)
@@ -604,7 +604,7 @@ static MACHINE_RESET(crystal)
 	Timer3=timer_alloc(Timer3cb, NULL);
 	timer_adjust_oneshot(Timer3,attotime_never,0);
 
-	VR0_Snd_Set_Areas(textureram,frameram);
+	vr0_snd_set_areas(textureram,frameram);
 #ifdef IDLE_LOOP_SPEEDUP
 	FlipCntRead=0;
 #endif
@@ -798,7 +798,7 @@ static INPUT_PORTS_START(crystal)
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
-static const struct VR0Interface vr0_interface =
+static const vr0_interface vr0_config =
 {
 	0x04800000
 };
@@ -830,7 +830,7 @@ static MACHINE_DRIVER_START( crystal )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("vrender", VRENDER0, 0)
-	MDRV_SOUND_CONFIG(vr0_interface)
+	MDRV_SOUND_CONFIG(vr0_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/cshooter.c b/src/mame/drivers/cshooter.c
index c3f72ab6573..d087abb473c 100644
--- a/src/mame/drivers/cshooter.c
+++ b/src/mame/drivers/cshooter.c
@@ -335,10 +335,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) // YM2203_control_port_0_w ?
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) // YM2203_write_port_0_w
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(SMH_NOP) // YM2203_control_port_1_w ?
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(SMH_NOP) // YM2203_write_port_1_w
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP) // ym2203_control_port_0_w ?
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(SMH_NOP) // ym2203_write_port_0_w
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(SMH_NOP) // ym2203_control_port_1_w ?
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(SMH_NOP) // ym2203_write_port_1_w
 	AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM)
 ADDRESS_MAP_END
 
@@ -349,11 +349,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( s2_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) // YM2203_control_port_0_w ?
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(SMH_NOP) // YM2203_write_port_0_w
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP) // ym2203_control_port_0_w ?
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(SMH_NOP) // ym2203_write_port_0_w
 
-	AM_RANGE(0x4008, 0x4008) AM_WRITE(SMH_NOP) // YM2203_control_port_0_w ?
-	AM_RANGE(0x4009, 0x4009) AM_WRITE(SMH_NOP) // YM2203_write_port_0_w
+	AM_RANGE(0x4008, 0x4008) AM_WRITE(SMH_NOP) // ym2203_control_port_0_w ?
+	AM_RANGE(0x4009, 0x4009) AM_WRITE(SMH_NOP) // ym2203_write_port_0_w
 
 
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/csk.c b/src/mame/drivers/csk.c
index e07641c12ef..f332368bd22 100644
--- a/src/mame/drivers/csk.c
+++ b/src/mame/drivers/csk.c
@@ -204,8 +204,8 @@ static ADDRESS_MAP_START( cpoker_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x5090, 0x5090) AM_WRITE(custom_io_w)
 	AM_RANGE(0x5091, 0x5091) AM_READ(custom_io_r)			/* Keyboard */
 	AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("50A0")			/* Not connected */
-	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w)
+	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(ym2413_data_port_0_w)
 	AM_RANGE(0x6800, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&cpk_expram)
 	AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE(&cpk_videoram)
 	AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&cpk_colorram)
@@ -224,8 +224,8 @@ static ADDRESS_MAP_START( csk227_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x5082, 0x5082) AM_READ_PORT("5082")			/* Coing & Kbd */
 	AM_RANGE(0x5091, 0x5091) AM_READ_PORT("5091")			/* Keyboard */
 	AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("50A0")			/* Not connected */
-	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w)
+	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(ym2413_data_port_0_w)
 	AM_RANGE(0x6800, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&cpk_expram)
 	AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE(&cpk_videoram)
 	AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&cpk_colorram)
@@ -245,8 +245,8 @@ static ADDRESS_MAP_START( csk234_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x5090, 0x5090) AM_WRITE(custom_io_w)
 	AM_RANGE(0x5091, 0x5091) AM_READ(custom_io_r)			/* used for protection and other */
 	AM_RANGE(0x50a0, 0x50a0) AM_READ_PORT("50A0")			/* Not connected */
-	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w)
+	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(ym2413_data_port_0_w)
 	AM_RANGE(0x6800, 0x6fff) AM_WRITE(SMH_RAM) AM_BASE(&cpk_expram)
 	AM_RANGE(0x7000, 0x77ff) AM_RAM AM_BASE(&cpk_videoram)
 	AM_RANGE(0x7800, 0x7fff) AM_RAM AM_BASE(&cpk_colorram)
diff --git a/src/mame/drivers/cvs.c b/src/mame/drivers/cvs.c
index 3adf242ce6d..9beacfb3528 100644
--- a/src/mame/drivers/cvs.c
+++ b/src/mame/drivers/cvs.c
@@ -336,7 +336,7 @@ static WRITE8_HANDLER( cvs_4_bit_dac_data_w )
 			    (cvs_4_bit_dac_data[3] << 3);
 
 	/* scale up to a full byte and output */
-	DAC_1_data_w(machine, 0, (dac_value << 4) | dac_value);
+	dac_1_data_w(machine, 0, (dac_value << 4) | dac_value);
 }
 
 
@@ -353,30 +353,30 @@ static void speech_execute_command(running_machine *machine, UINT8 command)
 	/* reset */
 	if (command == 0x3f)
 	{
-		tms5110_CTL_w(machine, 0, TMS5110_CMD_RESET);
+		tms5110_ctl_w(machine, 0, TMS5110_CMD_RESET);
 
-		tms5110_PDC_w(machine, 0,0);
-		tms5110_PDC_w(machine, 0,1);
-		tms5110_PDC_w(machine, 0,0);
+		tms5110_pdc_w(machine, 0,0);
+		tms5110_pdc_w(machine, 0,1);
+		tms5110_pdc_w(machine, 0,0);
 
-		tms5110_PDC_w(machine, 0,0);
-		tms5110_PDC_w(machine, 0,1);
-		tms5110_PDC_w(machine, 0,0);
+		tms5110_pdc_w(machine, 0,0);
+		tms5110_pdc_w(machine, 0,1);
+		tms5110_pdc_w(machine, 0,0);
 
-		tms5110_PDC_w(machine, 0,0);
-		tms5110_PDC_w(machine, 0,1);
-		tms5110_PDC_w(machine, 0,0);
+		tms5110_pdc_w(machine, 0,0);
+		tms5110_pdc_w(machine, 0,1);
+		tms5110_pdc_w(machine, 0,0);
 
 		speech_rom_bit_address = 0;
 	}
 	/* start */
 	else
 	{
-		tms5110_CTL_w(machine, 0, TMS5110_CMD_SPEAK);
+		tms5110_ctl_w(machine, 0, TMS5110_CMD_SPEAK);
 
-		tms5110_PDC_w(machine, 0, 0);
-		tms5110_PDC_w(machine, 0, 1);
-		tms5110_PDC_w(machine, 0, 0);
+		tms5110_pdc_w(machine, 0, 0);
+		tms5110_pdc_w(machine, 0, 1);
+		tms5110_pdc_w(machine, 0, 0);
 
 		speech_rom_bit_address = command * 0x80 * 8;
 	}
@@ -422,13 +422,13 @@ static WRITE8_HANDLER( cvs_tms5110_ctl_w )
 		  0 |								/* CTL4 */
 		  (cvs_tms5110_ctl_data[0] << 3);	/* CTL8 */
 
-	//tms5110_CTL_w(0, ctl);
+	//tms5110_ctl_w(0, ctl);
 }
 
 
 static WRITE8_HANDLER( cvs_tms5110_pdc_w )
 {
-	//tms5110_PDC_w(0, ~data >> 7);
+	//tms5110_pdc_w(0, ~data >> 7);
 }
 
 
@@ -552,7 +552,7 @@ static ADDRESS_MAP_START( cvs_dac_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
     AM_RANGE(0x1000, 0x107f) AM_RAM
     AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r)
-    AM_RANGE(0x1840, 0x1840) AM_WRITE(DAC_0_data_w)
+    AM_RANGE(0x1840, 0x1840) AM_WRITE(dac_0_data_w)
     AM_RANGE(0x1880, 0x1883) AM_WRITE(cvs_4_bit_dac_data_w) AM_BASE(&cvs_4_bit_dac_data)
     AM_RANGE(0x1884, 0x1887) AM_WRITE(SMH_NOP)		/* not connected to anything */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/cyberbal.c b/src/mame/drivers/cyberbal.c
index 40d14243333..6a613e410c3 100644
--- a/src/mame/drivers/cyberbal.c
+++ b/src/mame/drivers/cyberbal.c
@@ -209,8 +209,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_READWRITE(YM2151_status_port_0_r, YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_READWRITE(ym2151_status_port_0_r, ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x2800, 0x2801) AM_WRITE(cyberbal_sound_68k_6502_w)
 	AM_RANGE(0x2802, 0x2803) AM_READWRITE(atarigen_6502_irq_ack_r, atarigen_6502_irq_ack_w)
 	AM_RANGE(0x2804, 0x2805) AM_WRITE(atarigen_6502_sound_w)
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 84348898dd5..c1ff1203ed5 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -390,10 +390,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_mem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff ) AM_ROM
 	AM_RANGE(0x8000, 0x9fff ) AM_RAM
-	AM_RANGE(0xa000, 0xa000 ) AM_READWRITE(Y8950_status_port_0_r,Y8950_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001 ) AM_READWRITE(soundport_r,Y8950_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000 ) AM_READWRITE(Y8950_status_port_1_r,Y8950_control_port_1_w)
-	AM_RANGE(0xc001, 0xc001 ) AM_WRITE(Y8950_write_port_1_w)
+	AM_RANGE(0xa000, 0xa000 ) AM_READWRITE(y8950_status_port_0_r,y8950_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001 ) AM_READWRITE(soundport_r,y8950_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000 ) AM_READWRITE(y8950_status_port_1_r,y8950_control_port_1_w)
+	AM_RANGE(0xc001, 0xc001 ) AM_WRITE(y8950_write_port_1_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( cybertnk )
diff --git a/src/mame/drivers/dacholer.c b/src/mame/drivers/dacholer.c
index cd105b28013..b592f8944b1 100644
--- a/src/mame/drivers/dacholer.c
+++ b/src/mame/drivers/dacholer.c
@@ -135,12 +135,12 @@ static ADDRESS_MAP_START( snd_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x08, 0x08) AM_WRITE(snd_irq_w)
 	AM_RANGE(0x0c, 0x0c) AM_WRITE(snd_ack_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(adpcm_w)
-	AM_RANGE(0x86, 0x86) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x87, 0x87) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8a, 0x8a) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8b, 0x8b) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0x8f, 0x8f) AM_WRITE(AY8910_control_port_2_w)
+	AM_RANGE(0x86, 0x86) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x87, 0x87) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8a, 0x8a) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8b, 0x8b) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8e, 0x8e) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0x8f, 0x8f) AM_WRITE(ay8910_control_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/darius.c b/src/mame/drivers/darius.c
index 245002f8984..772bbd5fd59 100644
--- a/src/mame/drivers/darius.c
+++ b/src/mame/drivers/darius.c
@@ -476,10 +476,10 @@ static WRITE8_HANDLER( darius_write_portB1 )
 static ADDRESS_MAP_START( darius_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x9001, 0x9001) AM_READ(YM2203_read_port_0_r)
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_1_r)
-	AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_1_r)
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x9001, 0x9001) AM_READ(ym2203_read_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym2203_status_port_1_r)
+	AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_read_port_1_r)
 	AM_RANGE(0xb000, 0xb000) AM_READ(SMH_NOP)
 	AM_RANGE(0xb001, 0xb001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -487,10 +487,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( darius_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xb001, 0xb001) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(darius_fm0_pan)
diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c
index a5ee27d6079..0765de465c3 100644
--- a/src/mame/drivers/darkseal.c
+++ b/src/mame/drivers/darkseal.c
@@ -104,10 +104,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -116,18 +116,18 @@ static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
 	case 0:
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 		break;
 	}
 }
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x100000, 0x100001) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/dassault.c b/src/mame/drivers/dassault.c
index 854122ab73d..d8b311be977 100644
--- a/src/mame/drivers/dassault.c
+++ b/src/mame/drivers/dassault.c
@@ -270,8 +270,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x100000, 0x100001) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
@@ -280,8 +280,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_WRITE(YM2203_word_0_w)
-	AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w)
+	AM_RANGE(0x100000, 0x100001) AM_WRITE(ym2203_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
diff --git a/src/mame/drivers/dblewing.c b/src/mame/drivers/dblewing.c
index 4ab6e90fc09..28f1264e8c5 100644
--- a/src/mame/drivers/dblewing.c
+++ b/src/mame/drivers/dblewing.c
@@ -332,10 +332,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(0,data);
+		ym2151_register_port_0_w(0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(0,data);
+		ym2151_data_port_0_w(0,data);
 		break;
 	}
 }
@@ -345,7 +345,7 @@ static WRITE8_HANDLER( YM2151_w )
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-//  AM_RANGE(0xa000, 0xa001) AM_READWRITE(YM2151_status_port_0_r,YM2151_w)
+//  AM_RANGE(0xa000, 0xa001) AM_READWRITE(ym2151_status_port_0_r,YM2151_w)
 //  AM_RANGE(0xb000, 0xb000) AM_READ(okim6295_status_0_r)
 //  AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/dbz.c b/src/mame/drivers/dbz.c
index 236407c27f9..8e6a4c3e2ee 100644
--- a/src/mame/drivers/dbz.c
+++ b/src/mame/drivers/dbz.c
@@ -188,7 +188,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( dbz_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xc000, 0xc001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc000, 0xc001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xd000, 0xd002) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xe000, 0xe001) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -196,8 +196,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( dbz_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xd000, 0xd001) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index ff7b22350a3..a588f459ee6 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -201,7 +201,7 @@ static WRITE8_HANDLER( bsmt_data_w )
 	if (offset % 2 == 0)
 		sound_msb_latch = data;
 	else
-		BSMT2000_data_0_w(machine, offset/2, (sound_msb_latch << 8) | data, 0xffff);
+		bsmt2000_data_0_w(machine, offset/2, (sound_msb_latch << 8) | data, 0xffff);
 }
 
 
diff --git a/src/mame/drivers/dday.c b/src/mame/drivers/dday.c
index 5d0d105c7ef..12166c12e31 100644
--- a/src/mame/drivers/dday.c
+++ b/src/mame/drivers/dday.c
@@ -90,22 +90,22 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x5800, 0x5bff) AM_WRITE(dday_bgvideoram_w) AM_BASE(&dday_bgvideoram)
 	AM_RANGE(0x5c00, 0x5fff) AM_WRITE(dday_colorram_w) AM_BASE(&dday_colorram)
 	AM_RANGE(0x6000, 0x63ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x6400, 0x6400) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6401, 0x6401) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6402, 0x6402) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6403, 0x6403) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6404, 0x6404) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6405, 0x6405) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6406, 0x6406) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6407, 0x6407) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6408, 0x6408) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6409, 0x6409) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x640a, 0x640a) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x640b, 0x640b) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x640c, 0x640c) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x640d, 0x640d) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6800, 0x6800) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x6801, 0x6801) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x6400, 0x6400) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6401, 0x6401) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6402, 0x6402) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6403, 0x6403) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6404, 0x6404) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6405, 0x6405) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6406, 0x6406) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6407, 0x6407) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6408, 0x6408) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6409, 0x6409) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x640a, 0x640a) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x640b, 0x640b) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x640c, 0x640c) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x640d, 0x640d) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6800, 0x6800) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x6801, 0x6801) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x7800, 0x7800) AM_WRITE(dday_control_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ddayjlc.c b/src/mame/drivers/ddayjlc.c
index d181146531b..0738172b467 100644
--- a/src/mame/drivers/ddayjlc.c
+++ b/src/mame/drivers/ddayjlc.c
@@ -234,10 +234,10 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2000, 0x23ff) AM_RAM
 	AM_RANGE(0x7000, 0x7000) AM_WRITE(sound_nmi_w)
 
-	AM_RANGE(0x3000, 0x3000) AM_READ(AY8910_read_port_0_r) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x5000, 0x5000) AM_READ(AY8910_read_port_1_r) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x3000, 0x3000) AM_READ(ay8910_read_port_0_r) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x5000, 0x5000) AM_READ(ay8910_read_port_1_r) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_1_w)
 
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index fff5a7a0a9c..d701b8003ed 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1584,7 +1584,7 @@ static ADDRESS_MAP_START( quiz365_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x300286, 0x300287) AM_READ(ddenlovr_gfxrom_r			)	// Video Chip
 	AM_RANGE(0x3002c0, 0x3002c1) AM_READ(okim6295_status_0_lsb_r	)	// Sound
 	AM_RANGE(0x300340, 0x30035f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff)	// 6242RTC
-	AM_RANGE(0x300384, 0x300385) AM_READ(AY8910_read_port_0_lsb_r	)
+	AM_RANGE(0x300384, 0x300385) AM_READ(ay8910_read_port_0_lsb_r	)
 	AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM					)	// RAM
 ADDRESS_MAP_END
 
@@ -1603,12 +1603,12 @@ static ADDRESS_MAP_START( quiz365_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x30026a, 0x30026b) AM_WRITE(ddenlovr16_priority_w			)
 	AM_RANGE(0x30026c, 0x30026d) AM_WRITE(ddenlovr16_layer_enable_w		)
 	AM_RANGE(0x300280, 0x300283) AM_WRITE(ddenlovr_blitter_w			)
-	AM_RANGE(0x300300, 0x300301) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0x300302, 0x300303) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0x300300, 0x300301) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0x300302, 0x300303) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0x300340, 0x30035f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff)   // 6242RTC
 	AM_RANGE(0x3003ca, 0x3003cb) AM_WRITE(ddenlovr_blitter_irq_ack_w	)	// Blitter irq acknowledge
-	AM_RANGE(0x300380, 0x300381) AM_WRITE(AY8910_control_port_0_lsb_w	)
-	AM_RANGE(0x300382, 0x300383) AM_WRITE(AY8910_write_port_0_lsb_w		)
+	AM_RANGE(0x300380, 0x300381) AM_WRITE(ay8910_control_port_0_lsb_w	)
+	AM_RANGE(0x300382, 0x300383) AM_WRITE(ay8910_write_port_0_lsb_w		)
 	AM_RANGE(0x3002c0, 0x3002c1) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x3003c2, 0x3003c3) AM_WRITE(quiz365_oki_bank1_w			)
 	AM_RANGE(0x3003cc, 0x3003cd) AM_WRITE(quiz365_oki_bank2_w			)
@@ -1667,11 +1667,11 @@ static ADDRESS_MAP_START( ddenlvrj_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x30006a, 0x30006b) AM_WRITE(ddenlovr16_priority_w			)
 	AM_RANGE(0x30006c, 0x30006d) AM_WRITE(ddenlovr16_layer_enable_w		)
 	AM_RANGE(0x300080, 0x300083) AM_WRITE(ddenlovr_blitter_w			)
-	AM_RANGE(0x3000c0, 0x3000c1) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0x3000c2, 0x3000c3) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0x3000c0, 0x3000c1) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0x3000c2, 0x3000c3) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0x300100, 0x30011f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff)	// 6242RTC
-	AM_RANGE(0x300140, 0x300141) AM_WRITE(AY8910_control_port_0_lsb_w	)
-	AM_RANGE(0x300142, 0x300143) AM_WRITE(AY8910_write_port_0_lsb_w		)
+	AM_RANGE(0x300140, 0x300141) AM_WRITE(ay8910_control_port_0_lsb_w	)
+	AM_RANGE(0x300142, 0x300143) AM_WRITE(ay8910_write_port_0_lsb_w		)
 	AM_RANGE(0x300188, 0x300189) AM_WRITE(ddenlvrj_coincounter_w		)	// Coin Counters
 	AM_RANGE(0x30018a, 0x30018b) AM_WRITE(SMH_RAM						) AM_BASE( &ddenlvrj_dsw_sel )	// DSW select
 	AM_RANGE(0x30018c, 0x30018d) AM_WRITE(ddenlovr_oki_bank_w			)
@@ -1690,7 +1690,7 @@ static ADDRESS_MAP_START( ddenlovr_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xe00104, 0xe00105) AM_READ(ddenlovr_special_r			)	// Coins + ?
 	AM_RANGE(0xe00200, 0xe00201) AM_READ_PORT("DSW")					// DSW
 	AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r,	0x00ff)	// 6242RTC
-	AM_RANGE(0xe00604, 0xe00605) AM_READ(AY8910_read_port_0_lsb_r	)
+	AM_RANGE(0xe00604, 0xe00605) AM_READ(ay8910_read_port_0_lsb_r	)
 	AM_RANGE(0xe00700, 0xe00701) AM_READ(okim6295_status_0_lsb_r	)	// Sound
 	AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM					)	// RAM
 ADDRESS_MAP_END
@@ -1711,12 +1711,12 @@ static ADDRESS_MAP_START( ddenlovr_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xe00302, 0xe00303) AM_WRITE(ddenlovr_blitter_irq_ack_w	)	// Blitter irq acknowledge
 	AM_RANGE(0xe00308, 0xe00309) AM_WRITE(ddenlovr_coincounter_0_w		)	// Coin Counters
 	AM_RANGE(0xe0030c, 0xe0030d) AM_WRITE(ddenlovr_coincounter_1_w		)	//
-	AM_RANGE(0xe00400, 0xe00401) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0xe00402, 0xe00403) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0xe00400, 0xe00401) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0xe00402, 0xe00403) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff)	// 6242RTC
 //  AM_RANGE(0xe00302, 0xe00303) AM_WRITE(SMH_NOP                     )   // ?
-	AM_RANGE(0xe00600, 0xe00601) AM_WRITE(AY8910_control_port_0_lsb_w	)
-	AM_RANGE(0xe00602, 0xe00603) AM_WRITE(AY8910_write_port_0_lsb_w		)
+	AM_RANGE(0xe00600, 0xe00601) AM_WRITE(ay8910_control_port_0_lsb_w	)
+	AM_RANGE(0xe00602, 0xe00603) AM_WRITE(ay8910_write_port_0_lsb_w		)
 	AM_RANGE(0xe00700, 0xe00701) AM_WRITE(okim6295_data_0_lsb_w 		)
 	AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM						)	// RAM
 ADDRESS_MAP_END
@@ -1796,11 +1796,11 @@ static ADDRESS_MAP_START( nettoqc_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x30006a, 0x30006b) AM_WRITE(ddenlovr16_priority_w			)
 	AM_RANGE(0x30006c, 0x30006d) AM_WRITE(ddenlovr16_layer_enable_w		)
 	AM_RANGE(0x300080, 0x300083) AM_WRITE(ddenlovr_blitter_w			)
-	AM_RANGE(0x3000c0, 0x3000c1) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0x3000c2, 0x3000c3) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0x3000c0, 0x3000c1) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0x3000c2, 0x3000c3) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0x300100, 0x30011f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff)	// 6242RTC
-	AM_RANGE(0x300140, 0x300141) AM_WRITE(AY8910_control_port_0_lsb_w	)
-	AM_RANGE(0x300142, 0x300143) AM_WRITE(AY8910_write_port_0_lsb_w		)
+	AM_RANGE(0x300140, 0x300141) AM_WRITE(ay8910_control_port_0_lsb_w	)
+	AM_RANGE(0x300142, 0x300143) AM_WRITE(ay8910_write_port_0_lsb_w		)
 	AM_RANGE(0x300188, 0x300189) AM_WRITE(nettoqc_coincounter_w			)	// Coin Counters
 	AM_RANGE(0x30018a, 0x30018b) AM_WRITE(ddenlovr_select_16_w				)	//
 	AM_RANGE(0x30018c, 0x30018d) AM_WRITE(nettoqc_oki_bank_w			)
@@ -1868,8 +1868,8 @@ static ADDRESS_MAP_START( quizchq_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_G
 	AM_RANGE(0x1e, 0x1e) AM_WRITE(rongrong_select_w			)
 	AM_RANGE(0x20, 0x20) AM_WRITE(ddenlovr_select2_w			)
 	AM_RANGE(0x40, 0x40) AM_WRITE(okim6295_data_0_w			)
-	AM_RANGE(0x60, 0x60) AM_WRITE(YM2413_register_port_0_w	)
-	AM_RANGE(0x61, 0x61) AM_WRITE(YM2413_data_port_0_w		)
+	AM_RANGE(0x60, 0x60) AM_WRITE(ym2413_register_port_0_w	)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ym2413_data_port_0_w		)
 	AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w		)
 	AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w		)
 	AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w	)
@@ -1913,8 +1913,8 @@ static ADDRESS_MAP_START( rongrong_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x1e, 0x1e) AM_WRITE(rongrong_select_w			)
 	AM_RANGE(0x20, 0x2f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
 	AM_RANGE(0x40, 0x40) AM_WRITE(okim6295_data_0_w			)
-	AM_RANGE(0x60, 0x60) AM_WRITE(YM2413_register_port_0_w	)
-	AM_RANGE(0x61, 0x61) AM_WRITE(YM2413_data_port_0_w		)
+	AM_RANGE(0x60, 0x60) AM_WRITE(ym2413_register_port_0_w	)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ym2413_data_port_0_w		)
 	AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w		)
 	AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w		)
 	AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w	)
@@ -2086,10 +2086,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( mmpanic_sound_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x04, 0x04) AM_WRITE(SMH_NOP					)	// 0, during IRQ
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP					)	// almost always 1, sometimes 0
-	AM_RANGE(0x08, 0x08) AM_WRITE(YM2413_register_port_0_w	)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2413_data_port_0_w		)
-	AM_RANGE(0x0c, 0x0c) AM_WRITE(AY8910_write_port_0_w		)
-	AM_RANGE(0x0e, 0x0e) AM_WRITE(AY8910_control_port_0_w	)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ym2413_register_port_0_w	)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2413_data_port_0_w		)
+	AM_RANGE(0x0c, 0x0c) AM_WRITE(ay8910_write_port_0_w		)
+	AM_RANGE(0x0e, 0x0e) AM_WRITE(ay8910_control_port_0_w	)
 ADDRESS_MAP_END
 
 
@@ -2396,8 +2396,8 @@ static ADDRESS_MAP_START( hanakanz_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x81, 0x81) AM_WRITE( hanakanz_palette_w		)
 	AM_RANGE(0x93, 0x93) AM_WRITE( hanakanz_coincounter_w	)
 	AM_RANGE(0x94, 0x94) AM_WRITE( hanakanz_keyb_w			)
-	AM_RANGE(0xa0, 0xa0) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0xa1, 0xa1) AM_WRITE( YM2413_data_port_0_w		)
+	AM_RANGE(0xa0, 0xa0) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0xa1, 0xa1) AM_WRITE( ym2413_data_port_0_w		)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE( okim6295_data_0_w		)
 	AM_RANGE(0xe0, 0xef) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
 ADDRESS_MAP_END
@@ -2421,8 +2421,8 @@ static ADDRESS_MAP_START( hkagerou_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x31, 0x31) AM_WRITE( hanakanz_dsw_w			)
 	AM_RANGE(0x80, 0x80) AM_WRITE( hanakanz_blitter_data_w	)
 	AM_RANGE(0x81, 0x81) AM_WRITE( hanakanz_palette_w		)
-	AM_RANGE(0xa0, 0xa0) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0xa1, 0xa1) AM_WRITE( YM2413_data_port_0_w		)
+	AM_RANGE(0xa0, 0xa0) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0xa1, 0xa1) AM_WRITE( ym2413_data_port_0_w		)
 	AM_RANGE(0xb3, 0xb3) AM_WRITE( hanakanz_coincounter_w	)
 	AM_RANGE(0xb4, 0xb4) AM_WRITE( hanakanz_keyb_w			)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE( okim6295_data_0_w		)
@@ -2464,8 +2464,8 @@ static ADDRESS_MAP_START( mjreach1_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x90, 0x90) AM_WRITE( hanakanz_keyb_w			)
 	AM_RANGE(0x93, 0x93) AM_WRITE( mjreach1_protection_w	)
 	AM_RANGE(0x97, 0x97) AM_WRITE( hanakanz_coincounter_w	)
-	AM_RANGE(0xa0, 0xa0) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0xa1, 0xa1) AM_WRITE( YM2413_data_port_0_w		)
+	AM_RANGE(0xa0, 0xa0) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0xa1, 0xa1) AM_WRITE( ym2413_data_port_0_w		)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE( okim6295_data_0_w		)
 	AM_RANGE(0xe0, 0xef) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
 ADDRESS_MAP_END
@@ -2597,10 +2597,10 @@ static ADDRESS_MAP_START( mjchuuka_writeport, ADDRESS_SPACE_IO, 8 )	// 16 bit I/
 	AM_RANGE(0x41, 0x41) AM_MIRROR(0xff00) AM_WRITE( hanakanz_keyb_w			)
 	AM_RANGE(0x80, 0x80) AM_MIRROR(0xff00) AM_WRITE( okim6295_data_0_w			)
 	AM_RANGE(0xc0, 0xcf) AM_MIRROR(0xff00) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
-	AM_RANGE(0xa0, 0xa0) AM_MIRROR(0xff00) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0xa1, 0xa1) AM_MIRROR(0xff00) AM_WRITE( YM2413_data_port_0_w		)
-	AM_RANGE(0xe0, 0xe0) AM_MIRROR(0xff00) AM_WRITE( AY8910_control_port_0_w	)
-	AM_RANGE(0xe1, 0xe1) AM_MIRROR(0xff00) AM_WRITE( AY8910_write_port_0_w		)
+	AM_RANGE(0xa0, 0xa0) AM_MIRROR(0xff00) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0xa1, 0xa1) AM_MIRROR(0xff00) AM_WRITE( ym2413_data_port_0_w		)
+	AM_RANGE(0xe0, 0xe0) AM_MIRROR(0xff00) AM_WRITE( ay8910_control_port_0_w	)
+	AM_RANGE(0xe1, 0xe1) AM_MIRROR(0xff00) AM_WRITE( ay8910_write_port_0_w		)
 	AM_RANGE(0x1e, 0x1e) AM_MIRROR(0xff00) AM_WRITE( mjchuuka_oki_bank_w		)
 ADDRESS_MAP_END
 
@@ -2707,7 +2707,7 @@ static ADDRESS_MAP_START( mjmyster_readport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_G
 	AM_RANGE(0x22, 0x22) AM_READ( mjmyster_coins_r			)
 	AM_RANGE(0x23, 0x23) AM_READ( mjmyster_keyb_r			)
 	AM_RANGE(0x40, 0x40) AM_READ( okim6295_status_0_r		)
-	AM_RANGE(0x44, 0x44) AM_READ( AY8910_read_port_0_r		)
+	AM_RANGE(0x44, 0x44) AM_READ( ay8910_read_port_0_r		)
 	AM_RANGE(0x60, 0x6f) AM_DEVREAD(MSM6242, "rtc", msm6242_r)	// 6242RTC
 	AM_RANGE(0x98, 0x98) AM_READ( unk_r						)	// ? must be 78 on startup
 	AM_RANGE(0xc2, 0xc2) AM_READ( hanakanz_rand_r			)
@@ -2721,10 +2721,10 @@ static ADDRESS_MAP_START( mjmyster_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x20, 0x20) AM_WRITE( mjmyster_select2_w		)
 	AM_RANGE(0x21, 0x21) AM_WRITE( mjmyster_coincounter_w	)
 	AM_RANGE(0x40, 0x40) AM_WRITE( okim6295_data_0_w		)
-	AM_RANGE(0x42, 0x42) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0x43, 0x43) AM_WRITE( YM2413_data_port_0_w		)
-	AM_RANGE(0x46, 0x46) AM_WRITE( AY8910_write_port_0_w	)
-	AM_RANGE(0x48, 0x48) AM_WRITE( AY8910_control_port_0_w	)
+	AM_RANGE(0x42, 0x42) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0x43, 0x43) AM_WRITE( ym2413_data_port_0_w		)
+	AM_RANGE(0x46, 0x46) AM_WRITE( ay8910_write_port_0_w	)
+	AM_RANGE(0x48, 0x48) AM_WRITE( ay8910_control_port_0_w	)
 	AM_RANGE(0x60, 0x6f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
 	AM_RANGE(0x80, 0x83) AM_WRITE( ddenlovr_palette_base_w		)
 	AM_RANGE(0x84, 0x87) AM_WRITE( ddenlovr_palette_mask_w		)
@@ -2886,7 +2886,7 @@ static WRITE8_HANDLER( hginga_blitter_w )
 static ADDRESS_MAP_START( hginga_readport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x03, 0x03) AM_READ( rongrong_gfxrom_r			)
 	AM_RANGE(0x1c, 0x1c) AM_READ( SMH_NOP					)
-	AM_RANGE(0x24, 0x24) AM_READ( AY8910_read_port_0_r		)
+	AM_RANGE(0x24, 0x24) AM_READ( ay8910_read_port_0_r		)
 	AM_RANGE(0x60, 0x6f) AM_DEVREAD(MSM6242, "rtc", msm6242_r)	// 6242RTC
 	AM_RANGE(0x42, 0x42) AM_READ( hginga_coins_r			)
 	AM_RANGE(0x43, 0x43) AM_READ( hginga_input_r			)
@@ -2897,10 +2897,10 @@ static ADDRESS_MAP_START( hginga_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_GL
 	AM_RANGE(0x00, 0x01) AM_WRITE( hginga_blitter_w			)
 	AM_RANGE(0x1c, 0x1c) AM_WRITE( mjmyster_rambank_w		)
 	AM_RANGE(0x1e, 0x1e) AM_WRITE( hginga_rombank_w			)
-	AM_RANGE(0x22, 0x22) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0x23, 0x23) AM_WRITE( YM2413_data_port_0_w		)
-	AM_RANGE(0x26, 0x26) AM_WRITE( AY8910_write_port_0_w	)
-	AM_RANGE(0x28, 0x28) AM_WRITE( AY8910_control_port_0_w	)
+	AM_RANGE(0x22, 0x22) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0x23, 0x23) AM_WRITE( ym2413_data_port_0_w		)
+	AM_RANGE(0x26, 0x26) AM_WRITE( ay8910_write_port_0_w	)
+	AM_RANGE(0x28, 0x28) AM_WRITE( ay8910_control_port_0_w	)
 	AM_RANGE(0x40, 0x40) AM_WRITE( hginga_input_w			)
 	AM_RANGE(0x41, 0x41) AM_WRITE( hginga_coins_w			)
 	AM_RANGE(0x60, 0x6f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
@@ -3003,7 +3003,7 @@ static ADDRESS_MAP_START( hgokou_readport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_GLO
 	AM_RANGE(0x58, 0x58) AM_READ(unk_r						)	// ? must be 78 on startup
 	AM_RANGE(0x62, 0x62) AM_READ(hgokou_input_r				)
 	AM_RANGE(0x80, 0x80) AM_READ(okim6295_status_0_r		)
-	AM_RANGE(0x84, 0x84) AM_READ(AY8910_read_port_0_r		)
+	AM_RANGE(0x84, 0x84) AM_READ(ay8910_read_port_0_r		)
 	AM_RANGE(0xb0, 0xb0) AM_READ(hanakanz_rand_r			)
 ADDRESS_MAP_END
 static ADDRESS_MAP_START( hgokou_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_GLOBAL_MASK(0xff)
@@ -3021,10 +3021,10 @@ static ADDRESS_MAP_START( hgokou_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_GL
 	AM_RANGE(0x60, 0x60) AM_WRITE(hginga_input_w			)
 	AM_RANGE(0x61, 0x61) AM_WRITE(hgokou_input_w			)
 	AM_RANGE(0x80, 0x80) AM_WRITE(okim6295_data_0_w			)
-	AM_RANGE(0x82, 0x82) AM_WRITE(YM2413_register_port_0_w	)
-	AM_RANGE(0x83, 0x83) AM_WRITE(YM2413_data_port_0_w		)
-	AM_RANGE(0x86, 0x86) AM_WRITE(AY8910_write_port_0_w	)
-	AM_RANGE(0x88, 0x88) AM_WRITE(AY8910_control_port_0_w	)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ym2413_register_port_0_w	)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ym2413_data_port_0_w		)
+	AM_RANGE(0x86, 0x86) AM_WRITE(ay8910_write_port_0_w	)
+	AM_RANGE(0x88, 0x88) AM_WRITE(ay8910_control_port_0_w	)
 ADDRESS_MAP_END
 
 
@@ -3109,8 +3109,8 @@ static ADDRESS_MAP_START( hparadis_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x1b, 0x1b) AM_WRITE(rongrong_blitter_busy_w	)
 	AM_RANGE(0x1e, 0x1e) AM_WRITE(hparadis_select_w			)
 	AM_RANGE(0x40, 0x40) AM_WRITE(okim6295_data_0_w			)
-	AM_RANGE(0x60, 0x60) AM_WRITE(YM2413_register_port_0_w	)
-	AM_RANGE(0x61, 0x61) AM_WRITE(YM2413_data_port_0_w		)
+	AM_RANGE(0x60, 0x60) AM_WRITE(ym2413_register_port_0_w	)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ym2413_data_port_0_w		)
 	AM_RANGE(0x80, 0x83) AM_WRITE(ddenlovr_palette_base_w		)
 	AM_RANGE(0x84, 0x87) AM_WRITE(ddenlovr_palette_mask_w		)
 	AM_RANGE(0x88, 0x8b) AM_WRITE(ddenlovr_transparency_pen_w	)
@@ -3148,7 +3148,7 @@ static ADDRESS_MAP_START( mjmywrld_readport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_G
 	AM_RANGE(0x22, 0x22) AM_READ( mjmywrld_coins_r			)
 	AM_RANGE(0x23, 0x23) AM_READ( mjmyster_keyb_r			)
 	AM_RANGE(0x40, 0x40) AM_READ( okim6295_status_0_r		)
-	AM_RANGE(0x44, 0x44) AM_READ( AY8910_read_port_0_r		)
+	AM_RANGE(0x44, 0x44) AM_READ( ay8910_read_port_0_r		)
 	AM_RANGE(0x60, 0x6f) AM_DEVREAD(MSM6242, "rtc", msm6242_r)	// 6242RTC
 	AM_RANGE(0x98, 0x98) AM_READ( unk_r						)	// ? must be 78 on startup
 	AM_RANGE(0xc0, 0xc0) AM_READ( hanakanz_rand_r			)
@@ -3162,10 +3162,10 @@ static ADDRESS_MAP_START( mjmywrld_writeport, ADDRESS_SPACE_IO, 8 )	ADDRESS_MAP_
 	AM_RANGE(0x20, 0x20) AM_WRITE( mjmyster_select2_w		)
 	AM_RANGE(0x21, 0x21) AM_WRITE( mjmyster_coincounter_w	)
 	AM_RANGE(0x40, 0x40) AM_WRITE( okim6295_data_0_w		)
-	AM_RANGE(0x42, 0x42) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0x43, 0x43) AM_WRITE( YM2413_data_port_0_w		)
-	AM_RANGE(0x46, 0x46) AM_WRITE( AY8910_write_port_0_w	)
-	AM_RANGE(0x48, 0x48) AM_WRITE( AY8910_control_port_0_w	)
+	AM_RANGE(0x42, 0x42) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0x43, 0x43) AM_WRITE( ym2413_data_port_0_w		)
+	AM_RANGE(0x46, 0x46) AM_WRITE( ay8910_write_port_0_w	)
+	AM_RANGE(0x48, 0x48) AM_WRITE( ay8910_control_port_0_w	)
 	AM_RANGE(0x60, 0x6f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
 	AM_RANGE(0x80, 0x83) AM_WRITE( ddenlovr_palette_base_w		)
 	AM_RANGE(0x84, 0x87) AM_WRITE( ddenlovr_palette_mask_w		)
@@ -3236,7 +3236,7 @@ static ADDRESS_MAP_START( akamaru_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xe00200, 0xe00201) AM_READ(akamaru_dsw_r				)	// DSW
 	AM_RANGE(0xe00204, 0xe00205) AM_READ(akamaru_blitter_r			)	// Blitter Busy & IRQ
 	AM_RANGE(0xe00500, 0xe0051f) AM_DEVREAD8(MSM6242, "rtc", msm6242_r, 0x00ff)	// 6242RTC
-	AM_RANGE(0xe00604, 0xe00605) AM_READ(AY8910_read_port_0_lsb_r	)
+	AM_RANGE(0xe00604, 0xe00605) AM_READ(ay8910_read_port_0_lsb_r	)
 	AM_RANGE(0xe00700, 0xe00701) AM_READ(okim6295_status_0_lsb_r	)	// Sound
 	AM_RANGE(0xff0000, 0xffffff) AM_READ(SMH_RAM					)	// RAM
 ADDRESS_MAP_END
@@ -3259,11 +3259,11 @@ static ADDRESS_MAP_START( akamaru_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xe00304, 0xe00307) AM_WRITE(SMH_RAM						) AM_BASE( &akamaru_dsw_sel )	// DSW select
 	AM_RANGE(0xe00308, 0xe00309) AM_WRITE(ddenlovr_coincounter_0_w		)	// Coin Counters
 	AM_RANGE(0xe0030c, 0xe0030d) AM_WRITE(ddenlovr_coincounter_1_w		)	//
-	AM_RANGE(0xe00400, 0xe00401) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0xe00402, 0xe00403) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0xe00400, 0xe00401) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0xe00402, 0xe00403) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0xe00500, 0xe0051f) AM_DEVWRITE8(MSM6242, "rtc", msm6242_w, 0x00ff)	// 6242RTC
-	AM_RANGE(0xe00600, 0xe00601) AM_WRITE(AY8910_control_port_0_lsb_w	)
-	AM_RANGE(0xe00602, 0xe00603) AM_WRITE(AY8910_write_port_0_lsb_w		)
+	AM_RANGE(0xe00600, 0xe00601) AM_WRITE(ay8910_control_port_0_lsb_w	)
+	AM_RANGE(0xe00602, 0xe00603) AM_WRITE(ay8910_write_port_0_lsb_w		)
 	AM_RANGE(0xe00700, 0xe00701) AM_WRITE(okim6295_data_0_lsb_w 		)
 	AM_RANGE(0xff0000, 0xffffff) AM_WRITE(SMH_RAM						)	// RAM
 ADDRESS_MAP_END
@@ -3358,11 +3358,11 @@ static ADDRESS_MAP_START( mjflove_writeport, ADDRESS_SPACE_IO, 8 )	// 16 bit I/O
 	AM_RANGE(0x00fa, 0x00fa) AM_WRITE( mjflove_okibank_w		)
 	AM_RANGE(0x0181, 0x0181) AM_WRITE( SMH_NOP					)	// ? int. enable
 	AM_RANGE(0x0184, 0x0184) AM_WRITE( mjflove_coincounter_w	)
-	AM_RANGE(0x0200, 0x0200) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE(0x0201, 0x0201) AM_WRITE( YM2413_data_port_0_w		)
+	AM_RANGE(0x0200, 0x0200) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE(0x0201, 0x0201) AM_WRITE( ym2413_data_port_0_w		)
 	AM_RANGE(0x0280, 0x028f) AM_DEVWRITE(MSM6242, "rtc", msm6242_w)	// 6242RTC
-	AM_RANGE(0x0300, 0x0300) AM_WRITE( AY8910_control_port_0_w	)
-	AM_RANGE(0x0301, 0x0301) AM_WRITE( AY8910_write_port_0_w	)
+	AM_RANGE(0x0300, 0x0300) AM_WRITE( ay8910_control_port_0_w	)
+	AM_RANGE(0x0301, 0x0301) AM_WRITE( ay8910_write_port_0_w	)
 	AM_RANGE(0x0380, 0x0380) AM_WRITE( okim6295_data_0_w		)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ddragon.c b/src/mame/drivers/ddragon.c
index 5a9d576a9ba..0b07f509053 100644
--- a/src/mame/drivers/ddragon.c
+++ b/src/mame/drivers/ddragon.c
@@ -593,8 +593,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_RAM
 	AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
 	AM_RANGE(0x1800, 0x1800) AM_READ(dd_adpcm_status_r)
-	AM_RANGE(0x2800, 0x2800) AM_READWRITE(YM2151_status_port_0_r, YM2151_register_port_0_w)
-	AM_RANGE(0x2801, 0x2801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2800, 0x2800) AM_READWRITE(ym2151_status_port_0_r, ym2151_register_port_0_w)
+	AM_RANGE(0x2801, 0x2801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x3800, 0x3807) AM_WRITE(dd_adpcm_w)
 	AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
@@ -603,8 +603,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( dd2_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ddragon3.c b/src/mame/drivers/ddragon3.c
index 2705108f0f7..a2e66e28f48 100644
--- a/src/mame/drivers/ddragon3.c
+++ b/src/mame/drivers/ddragon3.c
@@ -177,7 +177,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xc801, 0xc801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc801, 0xc801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xd800, 0xd800) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -185,8 +185,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xd800, 0xd800) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0xe800, 0xe800) AM_WRITE(oki_bankswitch_w)
 ADDRESS_MAP_END
@@ -194,7 +194,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ctribe_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x8801, 0x8801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x9800, 0x9800) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -202,8 +202,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ctribe_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c
index 4bcb7938495..4855bcc2701 100644
--- a/src/mame/drivers/ddrible.c
+++ b/src/mame/drivers/ddrible.c
@@ -96,7 +96,7 @@ static READ8_HANDLER( ddrible_vlm5030_busy_r )
 	return mame_rand(machine); /* patch */
 	/* FIXME: remove ? */
 #if 0
-	if (VLM5030_BSY()) return 1;
+	if (vlm5030_bsy()) return 1;
 	else return 0;
 #endif
 }
@@ -111,10 +111,10 @@ static WRITE8_HANDLER( ddrible_vlm5030_ctrl_w )
 	/* b3 : ROM bank select   */
 	if (sndti_exists(SOUND_VLM5030, 0))
 	{
-		VLM5030_RST( data & 0x40 ? 1 : 0 );
-		VLM5030_ST(  data & 0x20 ? 1 : 0 );
-		VLM5030_VCU( data & 0x10 ? 1 : 0 );
-		VLM5030_set_rom(&SPEECH_ROM[data & 0x08 ? 0x10000 : 0]);
+		vlm5030_rst( data & 0x40 ? 1 : 0 );
+		vlm5030_st(  data & 0x20 ? 1 : 0 );
+		vlm5030_vcu( data & 0x10 ? 1 : 0 );
+		vlm5030_set_rom(&SPEECH_ROM[data & 0x08 ? 0x10000 : 0]);
 	}
 	/* b2 : SSG-C rc filter enable */
 	/* b1 : SSG-B rc filter enable */
@@ -173,16 +173,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM)					/* shared RAM with CPU #1 */
-	AM_RANGE(0x1000, 0x1000) AM_READ(YM2203_status_port_0_r)		/* YM2203 */
-	AM_RANGE(0x1001, 0x1001) AM_READ(YM2203_read_port_0_r)		/* YM2203 */
+	AM_RANGE(0x1000, 0x1000) AM_READ(ym2203_status_port_0_r)		/* YM2203 */
+	AM_RANGE(0x1001, 0x1001) AM_READ(ym2203_read_port_0_r)		/* YM2203 */
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)					/* ROM */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM) AM_BASE(&ddrible_snd_sharedram)	/* shared RAM with CPU #1 */
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w)			/* YM2203 */
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w)				/* YM2203 */
-	AM_RANGE(0x3000, 0x3000) AM_WRITE(VLM5030_data_w)						/* Speech data */
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym2203_control_port_0_w)			/* YM2203 */
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym2203_write_port_0_w)				/* YM2203 */
+	AM_RANGE(0x3000, 0x3000) AM_WRITE(vlm5030_data_w)						/* Speech data */
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)							/* ROM */
 ADDRESS_MAP_END
 
@@ -331,7 +331,7 @@ static const ym2203_interface ym2203_config =
 	NULL
 };
 
-static const struct VLM5030interface vlm5030_interface =
+static const vlm5030_interface vlm5030_config =
 {
 	0x10000     /* memory size 64Kbyte * 2 bank */
 };
@@ -380,7 +380,7 @@ static MACHINE_DRIVER_START( ddribble )
 	MDRV_SOUND_ROUTE(3, "mono", 0.25)
 
 	MDRV_SOUND_ADD("vlm", VLM5030, XTAL_3_579545MHz) /* verified on pcb */
-	MDRV_SOUND_CONFIG(vlm5030_interface)
+	MDRV_SOUND_CONFIG(vlm5030_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
 
 	MDRV_SOUND_ADD("filter1", FILTER_RC, 0)
diff --git a/src/mame/drivers/ddz.c b/src/mame/drivers/ddz.c
index 08f62fd68e8..2628482e7f1 100644
--- a/src/mame/drivers/ddz.c
+++ b/src/mame/drivers/ddz.c
@@ -45,7 +45,7 @@ static INPUT_PORTS_START(ddz)
 INPUT_PORTS_END
 
 
-static const struct VR0Interface vr0_interface =
+static const vr0_interface vr0_config =
 {
 	0x04800000
 };
@@ -76,7 +76,7 @@ static MACHINE_DRIVER_START( ddz )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("vrender", VRENDER0, 0)
-	MDRV_SOUND_CONFIG(vr0_interface)
+	MDRV_SOUND_CONFIG(vr0_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 4a7f8944a2d..b405fee7d76 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -294,10 +294,10 @@ static WRITE8_HANDLER( YM3812_w )
 {
 	switch (offset) {
 	case 0:
-		YM3812_control_port_0_w(machine,0,data);
+		ym3812_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM3812_write_port_0_w(machine,0,data);
+		ym3812_write_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -306,10 +306,10 @@ static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
 	case 0:
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 		break;
 	}
 }
diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c
index a65e609ee81..06dabd374f0 100644
--- a/src/mame/drivers/dec8.c
+++ b/src/mame/drivers/dec8.c
@@ -962,20 +962,20 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( dec8_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2203_control_port_0_w) /* OPN */
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(YM3812_control_port_0_w) /* OPL */
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2203_control_port_0_w) /* OPN */
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ym3812_control_port_0_w) /* OPL */
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
 /* Used by Gondomania, Psycho-Nics Oscar & Garyo Retsuden */
 static ADDRESS_MAP_START( oscar_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2203_control_port_0_w) /* OPN */
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(YM3526_control_port_0_w) /* OPL */
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2203_control_port_0_w) /* OPN */
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ym3526_control_port_0_w) /* OPL */
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
@@ -988,10 +988,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ym3526_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w) /* OPN */
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3526_control_port_0_w) /* OPL? */
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_control_port_0_w) /* OPN */
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym3526_control_port_0_w) /* OPL? */
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
@@ -1006,10 +1006,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( csilver_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(csilver_adpcm_data_w)	/* ADPCM data for the MSM5205 chip */
 	AM_RANGE(0x2000, 0x2000) AM_WRITE(csilver_sound_bank_w)
 	AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM)
diff --git a/src/mame/drivers/deco156.c b/src/mame/drivers/deco156.c
index 4fc57d103d2..c77e3be4c7d 100644
--- a/src/mame/drivers/deco156.c
+++ b/src/mame/drivers/deco156.c
@@ -214,15 +214,15 @@ static WRITE32_HANDLER(wcvol95_nonbuffered_palette_w)
 
 static READ32_HANDLER( deco156_snd_r )
 {
-	return YMZ280B_status_0_r(machine, 0);
+	return ymz280b_status_0_r(machine, 0);
 }
 
 static WRITE32_HANDLER( deco156_snd_w )
 {
 	if (offset)
-		YMZ280B_data_0_w(machine, 0, data);
+		ymz280b_data_0_w(machine, 0, data);
 	else
-		YMZ280B_register_0_w(machine, 0, data);
+		ymz280b_register_0_w(machine, 0, data);
 }
 
 /***************************************************************************/
@@ -407,7 +407,7 @@ static void sound_irq_gen(running_machine *machine, int state)
 	logerror("sound irq\n");
 }
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	sound_irq_gen
 };
diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c
index 3237a5c24cd..4209da0ec81 100644
--- a/src/mame/drivers/deco32.c
+++ b/src/mame/drivers/deco32.c
@@ -1131,7 +1131,7 @@ static WRITE8_HANDLER(deco32_bsmt0_w)
 
 static WRITE8_HANDLER(deco32_bsmt1_w)
 {
-	BSMT2000_data_0_w(machine, offset^ 0xff, ((bsmt_latch<<8)|data), 0xffff);
+	bsmt2000_data_0_w(machine, offset^ 0xff, ((bsmt_latch<<8)|data), 0xffff);
 	cpunum_set_input_line(machine, 1, M6809_IRQ_LINE, HOLD_LINE); /* BSMT is ready */
 }
 
@@ -1142,7 +1142,7 @@ static READ8_HANDLER(deco32_bsmt_status_r)
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
@@ -1151,7 +1151,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
@@ -1185,8 +1185,8 @@ static READ8_HANDLER(latch_r)
 static ADDRESS_MAP_START( nslasher_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_READ(YM2151_status_port_0_r) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_READ(ym2151_status_port_0_r) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xb000, 0xb000) AM_READ(okim6295_status_0_r) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_READ(okim6295_status_1_r) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0xd000, 0xd000) AM_READ(latch_r)
diff --git a/src/mame/drivers/deco_mlc.c b/src/mame/drivers/deco_mlc.c
index 8867b2aff41..8be2b1e0a6a 100644
--- a/src/mame/drivers/deco_mlc.c
+++ b/src/mame/drivers/deco_mlc.c
@@ -167,7 +167,7 @@ static WRITE32_HANDLER( avengrs_palette_w )
 static READ32_HANDLER( avengrs_sound_r )
 {
 	if (ACCESSING_BITS_24_31) {
-		return YMZ280B_status_0_r(machine,0)<<24;
+		return ymz280b_status_0_r(machine,0)<<24;
 	} else {
 		logerror("%08x:  non-byte read from sound mask %08x\n",activecpu_get_pc(),mem_mask);
 	}
@@ -179,9 +179,9 @@ static WRITE32_HANDLER( avengrs_sound_w )
 {
 	if (ACCESSING_BITS_24_31) {
 		if (offset)
-			YMZ280B_data_0_w(machine,0,data>>24);
+			ymz280b_data_0_w(machine,0,data>>24);
 		else
-			YMZ280B_register_0_w(machine,0,data>>24);
+			ymz280b_register_0_w(machine,0,data>>24);
 	} else {
 		logerror("%08x:  non-byte written to sound %08x mask %08x\n",activecpu_get_pc(),data,mem_mask);
 	}
diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c
index af355193328..12b6961290f 100644
--- a/src/mame/drivers/decocass.c
+++ b/src/mame/drivers/decocass.c
@@ -129,10 +129,10 @@ static ADDRESS_MAP_START( decocass_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_RAM
 	AM_RANGE(0x1000, 0x17ff) AM_READWRITE(decocass_sound_nmi_enable_r, decocass_sound_nmi_enable_w)
 	AM_RANGE(0x1800, 0x1fff) AM_READWRITE(decocass_sound_data_ack_reset_r, decocass_sound_data_ack_reset_w)
-	AM_RANGE(0x2000, 0x2fff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4fff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6fff) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8fff) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2fff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4fff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6fff) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8fff) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xa000, 0xafff) AM_READ(decocass_sound_command_r)
 	AM_RANGE(0xc000, 0xcfff) AM_WRITE(decocass_sound_data_w)
 	AM_RANGE(0xf800, 0xffff) AM_ROM
diff --git a/src/mame/drivers/deniam.c b/src/mame/drivers/deniam.c
index 4788fe58a93..020a123e2b2 100644
--- a/src/mame/drivers/deniam.c
+++ b/src/mame/drivers/deniam.c
@@ -80,13 +80,13 @@ static MACHINE_RESET( deniam )
 static WRITE16_HANDLER( YM3812_control_port_0_msb_w )
 {
 	if (ACCESSING_BITS_8_15)
-		YM3812_control_port_0_w(machine,0,(data >> 8) & 0xff);
+		ym3812_control_port_0_w(machine,0,(data >> 8) & 0xff);
 }
 
 static WRITE16_HANDLER( YM3812_write_port_0_msb_w )
 {
 	if (ACCESSING_BITS_8_15)
-		YM3812_write_port_0_w(machine,0,(data >> 8) & 0xff);
+		ym3812_write_port_0_w(machine,0,(data >> 8) & 0xff);
 }
 
 
@@ -134,8 +134,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x07, 0x07) AM_WRITE(deniam16b_oki_rom_bank_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 7a07cc24c4b..2c282274a60 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -34,10 +34,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -46,7 +46,7 @@ static WRITE8_HANDLER( YM2151_w )
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c
index 50be92a2640..86faae1c578 100644
--- a/src/mame/drivers/discoboy.c
+++ b/src/mame/drivers/discoboy.c
@@ -353,8 +353,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xec01, 0xec01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xec01, 0xec01) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/djboy.c b/src/mame/drivers/djboy.c
index 602e7d00a80..7b2e41a75fa 100644
--- a/src/mame/drivers/djboy.c
+++ b/src/mame/drivers/djboy.c
@@ -785,8 +785,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( cpu2_port_am, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(cpu2_bankswitch_w)
-	AM_RANGE(0x02, 0x02) AM_READ(YM2203_status_port_0_r) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_READ(YM2203_read_port_0_r) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READ(ym2203_status_port_0_r) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_READ(ym2203_read_port_0_r) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
 	AM_RANGE(0x06, 0x06) AM_READ(okim6295_status_0_r) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x07, 0x07) AM_READ(okim6295_status_1_r) AM_WRITE(okim6295_data_1_w)
diff --git a/src/mame/drivers/dlair.c b/src/mame/drivers/dlair.c
index 8596a73ff8b..560527e1137 100644
--- a/src/mame/drivers/dlair.c
+++ b/src/mame/drivers/dlair.c
@@ -472,13 +472,13 @@ static WRITE8_HANDLER( sio_w )
 static ADDRESS_MAP_START( dlus_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x9fff) AM_ROM
 	AM_RANGE(0xa000, 0xa7ff) AM_MIRROR(0x1800) AM_RAM
-	AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xc000, 0xc000) AM_MIRROR(0x1fc7) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0xc008, 0xc008) AM_MIRROR(0x1fc7) AM_READ_PORT("CONTROLS")
 	AM_RANGE(0xc010, 0xc010) AM_MIRROR(0x1fc7) AM_READ_PORT("SERVICE")
 	AM_RANGE(0xc020, 0xc020) AM_MIRROR(0x1fc7) AM_READ(laserdisc_r)
-	AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fc7) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1fc7) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe008, 0xe008) AM_MIRROR(0x1fc7) AM_WRITE(misc_w)
-	AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1fc7) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xe010, 0xe010) AM_MIRROR(0x1fc7) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xe020, 0xe020) AM_MIRROR(0x1fc7) AM_WRITE(laserdisc_w)
 	AM_RANGE(0xe030, 0xe037) AM_MIRROR(0x1fc0) AM_WRITE(led_den2_w)
 	AM_RANGE(0xe038, 0xe03f) AM_MIRROR(0x1fc0) AM_WRITE(led_den1_w)
diff --git a/src/mame/drivers/dogfgt.c b/src/mame/drivers/dogfgt.c
index 8edd0607909..8867aeea524 100644
--- a/src/mame/drivers/dogfgt.c
+++ b/src/mame/drivers/dogfgt.c
@@ -57,18 +57,18 @@ static WRITE8_HANDLER( dogfgt_soundcontrol_w )
 	{
 		/* bit 4 goes to the 8910 #0 BC1 pin */
 		if (last & 0x10)
-			AY8910_control_port_0_w(machine,0,soundlatch);
+			ay8910_control_port_0_w(machine,0,soundlatch);
 		else
-			AY8910_write_port_0_w(machine,0,soundlatch);
+			ay8910_write_port_0_w(machine,0,soundlatch);
 	}
 	/* bit 7 goes to 8910 #1 BDIR pin  */
 	if ((last & 0x80) == 0x80 && (data & 0x80) == 0x00)
 	{
 		/* bit 6 goes to the 8910 #1 BC1 pin */
 		if (last & 0x40)
-			AY8910_control_port_1_w(machine,0,soundlatch);
+			ay8910_control_port_1_w(machine,0,soundlatch);
 		else
-			AY8910_write_port_1_w(machine,0,soundlatch);
+			ay8910_write_port_1_w(machine,0,soundlatch);
 	}
 
 	last = data;
diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c
index 4683368353d..de55208d8de 100644
--- a/src/mame/drivers/dominob.c
+++ b/src/mame/drivers/dominob.c
@@ -126,8 +126,8 @@ static ADDRESS_MAP_START( memmap, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_READWRITE(SMH_ROM, SMH_NOP) // there are some garbage writes to ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0xd008, 0xd008) AM_WRITE(dominob_d008_w)
 	AM_RANGE(0xd00c, 0xd00c) AM_READ_PORT("IN0")
 	AM_RANGE(0xd010, 0xd010) AM_READ_PORT("IN1") AM_WRITE(SMH_NOP)
diff --git a/src/mame/drivers/dooyong.c b/src/mame/drivers/dooyong.c
index dc9d1702ff8..f2460b6eb1e 100644
--- a/src/mame/drivers/dooyong.c
+++ b/src/mame/drivers/dooyong.c
@@ -344,53 +344,53 @@ static ADDRESS_MAP_START( lastday_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
-	AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xf001, 0xf001) AM_READ(YM2203_read_port_0_r)
-	AM_RANGE(0xf002, 0xf002) AM_READ(YM2203_status_port_1_r)
-	AM_RANGE(0xf003, 0xf003) AM_READ(YM2203_read_port_1_r)
+	AM_RANGE(0xf000, 0xf000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xf001, 0xf001) AM_READ(ym2203_read_port_0_r)
+	AM_RANGE(0xf002, 0xf002) AM_READ(ym2203_status_port_1_r)
+	AM_RANGE(0xf003, 0xf003) AM_READ(ym2203_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( lastday_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xf002, 0xf002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xf003, 0xf003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xf002, 0xf002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xf003, 0xf003) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pollux_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
-	AM_RANGE(0xf802, 0xf802) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xf803, 0xf803) AM_READ(YM2203_read_port_0_r)
-	AM_RANGE(0xf804, 0xf804) AM_READ(YM2203_status_port_1_r)
-	AM_RANGE(0xf805, 0xf805) AM_READ(YM2203_read_port_1_r)
+	AM_RANGE(0xf802, 0xf802) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xf803, 0xf803) AM_READ(ym2203_read_port_0_r)
+	AM_RANGE(0xf804, 0xf804) AM_READ(ym2203_status_port_1_r)
+	AM_RANGE(0xf805, 0xf805) AM_READ(ym2203_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pollux_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf802, 0xf802) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xf803, 0xf803) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xf804, 0xf804) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xf805, 0xf805) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xf802, 0xf802) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xf803, 0xf803) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xf804, 0xf804) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xf805, 0xf805) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bluehawk_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
-	AM_RANGE(0xf809, 0xf809) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xf809, 0xf809) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xf80a, 0xf80a) AM_READ(okim6295_status_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bluehawk_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf808, 0xf808) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf809, 0xf809) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xf808, 0xf808) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf809, 0xf809) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xf80a, 0xf80a) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/dunhuang.c b/src/mame/drivers/dunhuang.c
index d2eacceb17a..f50b48688d7 100644
--- a/src/mame/drivers/dunhuang.c
+++ b/src/mame/drivers/dunhuang.c
@@ -416,8 +416,8 @@ static ADDRESS_MAP_START( dunhuang_io_map, ADDRESS_SPACE_IO, 8 )
 
 	AM_RANGE( 0x001b, 0x001b ) AM_WRITE( dunhuang_block_dest_w )
 
-	AM_RANGE( 0x0081, 0x0081 ) AM_WRITE( YM2413_register_port_0_w	)
-	AM_RANGE( 0x0089, 0x0089 ) AM_WRITE( YM2413_data_port_0_w		)
+	AM_RANGE( 0x0081, 0x0081 ) AM_WRITE( ym2413_register_port_0_w	)
+	AM_RANGE( 0x0089, 0x0089 ) AM_WRITE( ym2413_data_port_0_w		)
 
 //  AM_RANGE( 0x0082, 0x0082 ) AM_WRITE( dunhuang_82_w )
 
@@ -430,9 +430,9 @@ static ADDRESS_MAP_START( dunhuang_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x0086, 0x0086 ) AM_WRITE( dunhuang_rombank_w )
 	AM_RANGE( 0x0087, 0x0087 ) AM_WRITE( dunhuang_layers_w )
 
-	AM_RANGE( 0x0088, 0x0088 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x0090, 0x0090 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x0098, 0x0098 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x0088, 0x0088 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x0090, 0x0090 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x0098, 0x0098 ) AM_WRITE( ay8910_control_port_0_w )
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/dwarfd.c b/src/mame/drivers/dwarfd.c
index 2d712dcff29..ab7bb267713 100644
--- a/src/mame/drivers/dwarfd.c
+++ b/src/mame/drivers/dwarfd.c
@@ -365,9 +365,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
 
 	AM_RANGE(0x20, 0x20) AM_READWRITE(i8275_preg_r, i8275_preg_w)
 	AM_RANGE(0x21, 0x21) AM_READWRITE(i8275_sreg_r, i8275_creg_w)
diff --git a/src/mame/drivers/dynadice.c b/src/mame/drivers/dynadice.c
index 74b50a8833d..cb09b2bd061 100644
--- a/src/mame/drivers/dynadice.c
+++ b/src/mame/drivers/dynadice.c
@@ -60,8 +60,8 @@ static WRITE8_HANDLER( sound_control_w )
     D3 - /Reset
 
 */
-	if ((data &7)==7) AY8910_control_port_0_w(machine,0,ay_data);
-	if ((data &7)==6) AY8910_write_port_0_w(machine,0,ay_data);
+	if ((data &7)==7) ay8910_control_port_0_w(machine,0,ay_data);
+	if ((data &7)==6) ay8910_write_port_0_w(machine,0,ay_data);
 }
 
 
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 19f533bbe3a..1a7f672804e 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -538,10 +538,10 @@ static ADDRESS_MAP_START( hanamai_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x74, 0x74 ) AM_WRITE		( dynax_blitter_ack_w		)	// Blitter IRQ Ack
 	AM_RANGE( 0x76, 0x76 ) AM_WRITE		( dynax_blit_palbank_w		)	// Layers Palettes (High Bit)
 	AM_RANGE( 0x77, 0x77 ) AM_WRITE		( hanamai_layer_half_w		)	// half of the interleaved layer to write to
-	AM_RANGE( 0x78, 0x78 ) AM_READWRITE	( YM2203_status_port_0_r, YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE( 0x79, 0x79 ) AM_READWRITE	( YM2203_read_port_0_r,   YM2203_write_port_0_w		)	// 2 x DSW
-	AM_RANGE( 0x7a, 0x7a ) AM_WRITE		( AY8910_control_port_0_w	)	// AY8910
-	AM_RANGE( 0x7b, 0x7b ) AM_WRITE		( AY8910_write_port_0_w		)	//
+	AM_RANGE( 0x78, 0x78 ) AM_READWRITE	( ym2203_status_port_0_r, ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE( 0x79, 0x79 ) AM_READWRITE	( ym2203_read_port_0_r,   ym2203_write_port_0_w		)	// 2 x DSW
+	AM_RANGE( 0x7a, 0x7a ) AM_WRITE		( ay8910_control_port_0_w	)	// AY8910
+	AM_RANGE( 0x7b, 0x7b ) AM_WRITE		( ay8910_write_port_0_w		)	//
 //  AM_RANGE( 0x7c, 0x7c ) AM_WRITE     ( SMH_NOP                  )   // CRT Controller
 //  AM_RANGE( 0x7d, 0x7d ) AM_WRITE     ( SMH_NOP                  )   //
 	AM_RANGE( 0x7e, 0x7e ) AM_WRITE		( dynax_blit_romregion_w	)	// Blitter ROM bank
@@ -562,11 +562,11 @@ static ADDRESS_MAP_START( hnoridur_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x26, 0x26 ) AM_READ_PORT	( "DSW2"				)	// DSW3
 	AM_RANGE( 0x30, 0x30 ) AM_WRITE	( adpcm_reset_w				)	// MSM5205 reset
 	AM_RANGE( 0x32, 0x32 ) AM_WRITE	( adpcm_data_w				)	// MSM5205 data
-	AM_RANGE( 0x34, 0x34 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x35, 0x35 ) AM_WRITE	( YM2413_data_port_0_w		)	//
-	AM_RANGE( 0x36, 0x36 ) AM_READ	( AY8910_read_port_0_r		)	// AY8910, DSW1
-	AM_RANGE( 0x38, 0x38 ) AM_WRITE	( AY8910_write_port_0_w		)	// AY8910
-	AM_RANGE( 0x3a, 0x3a ) AM_WRITE	( AY8910_control_port_0_w	)	//
+	AM_RANGE( 0x34, 0x34 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x35, 0x35 ) AM_WRITE	( ym2413_data_port_0_w		)	//
+	AM_RANGE( 0x36, 0x36 ) AM_READ	( ay8910_read_port_0_r		)	// AY8910, DSW1
+	AM_RANGE( 0x38, 0x38 ) AM_WRITE	( ay8910_write_port_0_w		)	// AY8910
+	AM_RANGE( 0x3a, 0x3a ) AM_WRITE	( ay8910_control_port_0_w	)	//
 	AM_RANGE( 0x40, 0x40 ) AM_WRITE	( dynax_blit_pen_w			)	// Destination Pen
 	AM_RANGE( 0x41, 0x41 ) AM_WRITE	( dynax_blit_dest_w			)	// Destination Layer
 	AM_RANGE( 0x42, 0x42 ) AM_WRITE	( dynax_blit_palette01_w	)	// Layers Palettes
@@ -685,10 +685,10 @@ static ADDRESS_MAP_START( yarunara_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x11, 0x17 ) AM_WRITE	( dynax_blitter_rev2_w		)	// Blitter
 	AM_RANGE( 0x20, 0x20 ) AM_WRITE	( adpcm_reset_w				)	// MSM5205 reset
 	AM_RANGE( 0x22, 0x22 ) AM_WRITE	( adpcm_data_w				)	// MSM5205 data
-	AM_RANGE( 0x24, 0x24 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x25, 0x25 ) AM_WRITE	( YM2413_data_port_0_w		)	//
-	AM_RANGE( 0x28, 0x28 ) AM_WRITE	( AY8910_write_port_0_w		)	// AY8910
-	AM_RANGE( 0x2a, 0x2a ) AM_WRITE	( AY8910_control_port_0_w	)	//
+	AM_RANGE( 0x24, 0x24 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x25, 0x25 ) AM_WRITE	( ym2413_data_port_0_w		)	//
+	AM_RANGE( 0x28, 0x28 ) AM_WRITE	( ay8910_write_port_0_w		)	// AY8910
+	AM_RANGE( 0x2a, 0x2a ) AM_WRITE	( ay8910_control_port_0_w	)	//
 	AM_RANGE( 0x48, 0x48 ) AM_WRITE	( dynax_extra_scrollx_w		)	// screen scroll X
 	AM_RANGE( 0x49, 0x49 ) AM_WRITE	( dynax_extra_scrolly_w		)	// screen scroll Y
 	AM_RANGE( 0x4a, 0x4a ) AM_WRITE	( yarunara_rombank_w		)	// BANK ROM Select
@@ -725,10 +725,10 @@ static ADDRESS_MAP_START( mcnpshnt_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x26, 0x26 ) AM_READ_PORT	( "DSW1"				)	// DSW3
 	AM_RANGE( 0x30, 0x30 ) AM_WRITE	( adpcm_reset_w				)	// MSM5205 reset
 	AM_RANGE( 0x32, 0x32 ) AM_WRITE	( adpcm_data_w				)	// MSM5205 data
-	AM_RANGE( 0x34, 0x34 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x35, 0x35 ) AM_WRITE	( YM2413_data_port_0_w		)	//
-	AM_RANGE( 0x38, 0x38 ) AM_WRITE	( AY8910_write_port_0_w		)	// AY8910
-	AM_RANGE( 0x3a, 0x3a ) AM_WRITE	( AY8910_control_port_0_w	)	//
+	AM_RANGE( 0x34, 0x34 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x35, 0x35 ) AM_WRITE	( ym2413_data_port_0_w		)	//
+	AM_RANGE( 0x38, 0x38 ) AM_WRITE	( ay8910_write_port_0_w		)	// AY8910
+	AM_RANGE( 0x3a, 0x3a ) AM_WRITE	( ay8910_control_port_0_w	)	//
 	AM_RANGE( 0x40, 0x40 ) AM_WRITE	( dynax_blit_pen_w			)	// Destination Pen
 	AM_RANGE( 0x41, 0x41 ) AM_WRITE	( dynax_blit_dest_w			)	// Destination Layer
 	AM_RANGE( 0x42, 0x42 ) AM_WRITE	( dynax_blit_palette01_w	)	// Layers Palettes
@@ -754,8 +754,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sprtmtch_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE( 0x01, 0x07 ) AM_WRITE		( dynax_blitter_rev2_w		)	// Blitter
-	AM_RANGE( 0x10, 0x10 ) AM_READWRITE	( YM2203_status_port_0_r, YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE( 0x11, 0x11 ) AM_READWRITE	( YM2203_read_port_0_r,   YM2203_write_port_0_w		)	// 2 x DSW
+	AM_RANGE( 0x10, 0x10 ) AM_READWRITE	( ym2203_status_port_0_r, ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE( 0x11, 0x11 ) AM_READWRITE	( ym2203_read_port_0_r,   ym2203_write_port_0_w		)	// 2 x DSW
 //  AM_RANGE( 0x12, 0x12 ) AM_WRITE     ( SMH_NOP                   )   // CRT Controller
 //  AM_RANGE( 0x13, 0x13 ) AM_WRITE     ( SMH_NOP                   )   // CRT Controller
 	AM_RANGE( 0x20, 0x20 ) AM_READ_PORT	( "P1"						)	// P1
@@ -801,8 +801,8 @@ static ADDRESS_MAP_START( mjfriday_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x63, 0x63 ) AM_READ	( hanamai_keyboard_0_r		)	// P1
 	AM_RANGE( 0x64, 0x64 ) AM_READ_PORT	( "DSW0"				)	// DSW
 	AM_RANGE( 0x67, 0x67 ) AM_READ_PORT	( "DSW1"				)	// DSW
-	AM_RANGE( 0x70, 0x70 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x71, 0x71 ) AM_WRITE	( YM2413_data_port_0_w		)	//
+	AM_RANGE( 0x70, 0x70 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x71, 0x71 ) AM_WRITE	( ym2413_data_port_0_w		)	//
 //  AM_RANGE( 0x80, 0x80 ) AM_WRITE ( SMH_NOP                   )   // IRQ ack?
 ADDRESS_MAP_END
 
@@ -811,10 +811,10 @@ static ADDRESS_MAP_START( nanajign_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE( 0x00, 0x00 ) AM_WRITE	( adpcm_reset_w				)	// MSM5205 reset
 	AM_RANGE( 0x02, 0x02 ) AM_WRITE	( adpcm_data_w				)	// MSM5205 data
-	AM_RANGE( 0x04, 0x04 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x05, 0x05 ) AM_WRITE	( YM2413_data_port_0_w		)	//
-	AM_RANGE( 0x08, 0x08 ) AM_WRITE	( AY8910_write_port_0_w		)	// AY8910
-	AM_RANGE( 0x0a, 0x0a ) AM_WRITE	( AY8910_control_port_0_w	)	//
+	AM_RANGE( 0x04, 0x04 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x05, 0x05 ) AM_WRITE	( ym2413_data_port_0_w		)	//
+	AM_RANGE( 0x08, 0x08 ) AM_WRITE	( ay8910_write_port_0_w		)	// AY8910
+	AM_RANGE( 0x0a, 0x0a ) AM_WRITE	( ay8910_control_port_0_w	)	//
 	AM_RANGE( 0x10, 0x10 ) AM_WRITE	( hanamai_keyboard_w		)	// keyboard row select
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT	( "IN0"					)	// Coins
 	AM_RANGE( 0x12, 0x12 ) AM_READ	( hanamai_keyboard_1_r		)	// P2
@@ -940,11 +940,11 @@ static ADDRESS_MAP_START( jantouki_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE( 0x00, 0x00 ) AM_WRITE		( jantouki_sound_rombank_w		)	// BANK ROM Select
 	AM_RANGE( 0x10, 0x10 ) AM_WRITE		( jantouki_sound_vblank_ack_w	)	// VBlank IRQ Ack
-	AM_RANGE( 0x21, 0x21 ) AM_READ		( AY8910_read_port_0_r			)	// AY8910
-	AM_RANGE( 0x22, 0x22 ) AM_WRITE		( AY8910_write_port_0_w			)	//
-	AM_RANGE( 0x23, 0x23 ) AM_WRITE		( AY8910_control_port_0_w		)	//
-	AM_RANGE( 0x28, 0x28 ) AM_READWRITE	( YM2203_status_port_0_r, YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE( 0x29, 0x29 ) AM_READWRITE	( YM2203_read_port_0_r,   YM2203_write_port_0_w		)	//
+	AM_RANGE( 0x21, 0x21 ) AM_READ		( ay8910_read_port_0_r			)	// AY8910
+	AM_RANGE( 0x22, 0x22 ) AM_WRITE		( ay8910_write_port_0_w			)	//
+	AM_RANGE( 0x23, 0x23 ) AM_WRITE		( ay8910_control_port_0_w		)	//
+	AM_RANGE( 0x28, 0x28 ) AM_READWRITE	( ym2203_status_port_0_r, ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE( 0x29, 0x29 ) AM_READWRITE	( ym2203_read_port_0_r,   ym2203_write_port_0_w		)	//
 	AM_RANGE( 0x30, 0x30 ) AM_WRITE		( adpcm_reset_w					)	// MSM5205 reset
 	AM_RANGE( 0x40, 0x40 ) AM_WRITE		( adpcm_data_w					)	// MSM5205 data
 	AM_RANGE( 0x50, 0x50 ) AM_READ		( jantouki_soundlatch_status_r	)	// Soundlatch status
@@ -980,10 +980,10 @@ static ADDRESS_MAP_START( mjelctrn_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE( 0x00, 0x00 ) AM_WRITE	( adpcm_reset_w				)	// MSM5205 reset
 	AM_RANGE( 0x02, 0x02 ) AM_WRITE	( adpcm_data_w				)	// MSM5205 data
-	AM_RANGE( 0x04, 0x04 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x05, 0x05 ) AM_WRITE	( YM2413_data_port_0_w		)	//
-	AM_RANGE( 0x08, 0x08 ) AM_WRITE	( AY8910_write_port_0_w		)	// AY8910
-	AM_RANGE( 0x0a, 0x0a ) AM_WRITE	( AY8910_control_port_0_w	)	//
+	AM_RANGE( 0x04, 0x04 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x05, 0x05 ) AM_WRITE	( ym2413_data_port_0_w		)	//
+	AM_RANGE( 0x08, 0x08 ) AM_WRITE	( ay8910_write_port_0_w		)	// AY8910
+	AM_RANGE( 0x0a, 0x0a ) AM_WRITE	( ay8910_control_port_0_w	)	//
 	AM_RANGE( 0x11, 0x12 ) AM_WRITE	( mjelctrn_blitter_ack_w	)	//?
 //  AM_RANGE( 0x20, 0x20 ) AM_WRITE ( SMH_NOP                  )   // CRT Controller
 //  AM_RANGE( 0x21, 0x21 ) AM_WRITE ( SMH_NOP                  )   // CRT Controller
@@ -1126,11 +1126,11 @@ static ADDRESS_MAP_START( htengoku_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x21, 0x21 ) AM_WRITE ( htengoku_coin_w			)	//
 	AM_RANGE( 0x22, 0x22 ) AM_READ	( htengoku_coin_r			)	//
 	AM_RANGE( 0x23, 0x23 ) AM_READ	( htengoku_input_r			)	//
-	AM_RANGE( 0x40, 0x40 ) AM_WRITE	( AY8910_control_port_0_w	)	// AY8910
-	AM_RANGE( 0x42, 0x42 ) AM_READ  ( AY8910_read_port_0_r		)	//
-	AM_RANGE( 0x44, 0x44 ) AM_WRITE	( AY8910_write_port_0_w		)	//
-	AM_RANGE( 0x46, 0x46 ) AM_WRITE	( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x47, 0x47 ) AM_WRITE	( YM2413_data_port_0_w		)	//
+	AM_RANGE( 0x40, 0x40 ) AM_WRITE	( ay8910_control_port_0_w	)	// AY8910
+	AM_RANGE( 0x42, 0x42 ) AM_READ  ( ay8910_read_port_0_r		)	//
+	AM_RANGE( 0x44, 0x44 ) AM_WRITE	( ay8910_write_port_0_w		)	//
+	AM_RANGE( 0x46, 0x46 ) AM_WRITE	( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x47, 0x47 ) AM_WRITE	( ym2413_data_port_0_w		)	//
 	AM_RANGE( 0x80, 0x8f ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w)	// 6242RTC
 	AM_RANGE( 0xa0, 0xa3 ) AM_WRITE ( ddenlovr_palette_base_w		)	// ddenlovr mixer chip
 	AM_RANGE( 0xa4, 0xa7 ) AM_WRITE ( ddenlovr_palette_mask_w		)
@@ -1401,11 +1401,11 @@ static ADDRESS_MAP_START( tenkai_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(  0x6000,  0x6fff ) AM_RAM
 	AM_RANGE(  0x7000,  0x7fff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(  0x8000,  0xffff ) AM_READWRITE( tenkai_8000_r, tenkai_8000_w )
-	AM_RANGE( 0x10000, 0x10000 ) AM_READ ( AY8910_read_port_0_r		)	// AY8910
-	AM_RANGE( 0x10008, 0x10008 ) AM_WRITE( AY8910_write_port_0_w	)	//
-	AM_RANGE( 0x10010, 0x10010 ) AM_WRITE( AY8910_control_port_0_w	)	//
-	AM_RANGE( 0x10020, 0x10020 ) AM_WRITE( YM2413_register_port_0_w	)	// YM2413
-	AM_RANGE( 0x10021, 0x10021 ) AM_WRITE( YM2413_data_port_0_w		)	//
+	AM_RANGE( 0x10000, 0x10000 ) AM_READ ( ay8910_read_port_0_r		)	// AY8910
+	AM_RANGE( 0x10008, 0x10008 ) AM_WRITE( ay8910_write_port_0_w	)	//
+	AM_RANGE( 0x10010, 0x10010 ) AM_WRITE( ay8910_control_port_0_w	)	//
+	AM_RANGE( 0x10020, 0x10020 ) AM_WRITE( ym2413_register_port_0_w	)	// YM2413
+	AM_RANGE( 0x10021, 0x10021 ) AM_WRITE( ym2413_data_port_0_w		)	//
 	AM_RANGE( 0x10040, 0x10040 ) AM_WRITE( dynax_blit_pen_w			)	// Destination Pen
 	AM_RANGE( 0x10044, 0x10044 ) AM_WRITE( tenkai_blit_dest_w		)	// Destination Layer
 	AM_RANGE( 0x10048, 0x10048 ) AM_WRITE( tenkai_blit_palette23_w	)	// Layers Palettes
diff --git a/src/mame/drivers/enigma2.c b/src/mame/drivers/enigma2.c
index ba6f804dac0..dfea1fa44e6 100644
--- a/src/mame/drivers/enigma2.c
+++ b/src/mame/drivers/enigma2.c
@@ -443,9 +443,9 @@ static ADDRESS_MAP_START( engima2_audio_cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_MIRROR(0x1000) AM_ROM AM_WRITENOP
 	AM_RANGE(0x2000, 0x7fff) AM_NOP
 	AM_RANGE(0x8000, 0x83ff) AM_MIRROR(0x1c00) AM_RAM
-	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0xa003, 0xa003) AM_MIRROR(0x1ffc) AM_NOP
 	AM_RANGE(0xc000, 0xffff) AM_NOP
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/epos.c b/src/mame/drivers/epos.c
index 5894f4fb7c7..3e3ff3e44f4 100644
--- a/src/mame/drivers/epos.c
+++ b/src/mame/drivers/epos.c
@@ -103,8 +103,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(watchdog_reset_w)
 	AM_RANGE(0x01, 0x01) AM_WRITE(epos_port_1_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/equites.c b/src/mame/drivers/equites.c
index 46558027d68..1b3645feb14 100644
--- a/src/mame/drivers/equites.c
+++ b/src/mame/drivers/equites.c
@@ -557,10 +557,10 @@ static void equites_update_dac(void)
 	// Note that PB0 goes through three filters while PB1 only goes through one.
 
 	if (equites_8155_portb & 1)
-		DAC_signed_data_w(0, equites_dac_latch);
+		dac_signed_data_w(0, equites_dac_latch);
 
 	if (equites_8155_portb & 2)
-		DAC_signed_data_w(1, equites_dac_latch);
+		dac_signed_data_w(1, equites_dac_latch);
 }
 
 static WRITE8_HANDLER(equites_dac_latch_w)
@@ -754,8 +754,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r)
 	AM_RANGE(0xc080, 0xc08d) AM_WRITE(msm5232_0_w)
-	AM_RANGE(0xc0a0, 0xc0a0) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xc0a1, 0xc0a1) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xc0a0, 0xc0a0) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xc0a1, 0xc0a1) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xc0b0, 0xc0b0) AM_WRITENOP // n.c.
 	AM_RANGE(0xc0c0, 0xc0c0) AM_WRITE(equites_cymbal_ctrl_w)
 	AM_RANGE(0xc0d0, 0xc0d0) AM_WRITE(equites_dac_latch_w)	// followed by 1 (and usually 0) on 8155 port B
diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c
index 66268488192..e8488953946 100644
--- a/src/mame/drivers/esd16.c
+++ b/src/mame/drivers/esd16.c
@@ -311,8 +311,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( multchmp_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3812_control_port_0_w	)	// YM3812
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w		)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3812_control_port_0_w	)	// YM3812
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w		)
 	AM_RANGE(0x02, 0x02) AM_WRITE(okim6295_data_0_w			)	// M6295
 	AM_RANGE(0x04, 0x04) AM_WRITE(SMH_NOP					)	// ? $00, $30
 	AM_RANGE(0x05, 0x05) AM_WRITE(esd16_sound_rombank_w 	)	// ROM Bank
diff --git a/src/mame/drivers/espial.c b/src/mame/drivers/espial.c
index 3bb563e91bc..cf6cffca225 100644
--- a/src/mame/drivers/espial.c
+++ b/src/mame/drivers/espial.c
@@ -146,8 +146,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/ettrivia.c b/src/mame/drivers/ettrivia.c
index d840b2197c4..22279d5cc5b 100644
--- a/src/mame/drivers/ettrivia.c
+++ b/src/mame/drivers/ettrivia.c
@@ -93,20 +93,20 @@ static WRITE8_HANDLER( b800_w )
 		/* special case to return the value written to 0xb000 */
 		/* does it reset the chips too ? */
 		case 0:	break;
-		case 0xc4: b000_ret = AY8910_read_port_0_r(machine,0);	break;
-		case 0x94: b000_ret = AY8910_read_port_1_r(machine,0);	break;
-		case 0x86: b000_ret = AY8910_read_port_2_r(machine,0);	break;
+		case 0xc4: b000_ret = ay8910_read_port_0_r(machine,0);	break;
+		case 0x94: b000_ret = ay8910_read_port_1_r(machine,0);	break;
+		case 0x86: b000_ret = ay8910_read_port_2_r(machine,0);	break;
 
 		case 0x80:
 			switch(b800_prev)
 			{
-				case 0xe0: AY8910_control_port_0_w(machine,0,b000_val);	break;
-				case 0x98: AY8910_control_port_1_w(machine,0,b000_val);	break;
-				case 0x83: AY8910_control_port_2_w(machine,0,b000_val);	break;
+				case 0xe0: ay8910_control_port_0_w(machine,0,b000_val);	break;
+				case 0x98: ay8910_control_port_1_w(machine,0,b000_val);	break;
+				case 0x83: ay8910_control_port_2_w(machine,0,b000_val);	break;
 
-				case 0xa0: AY8910_write_port_0_w(machine,0,b000_val);	break;
-				case 0x88: AY8910_write_port_1_w(machine,0,b000_val);	break;
-				case 0x81: AY8910_write_port_2_w(machine,0,b000_val);	break;
+				case 0xa0: ay8910_write_port_0_w(machine,0,b000_val);	break;
+				case 0x88: ay8910_write_port_1_w(machine,0,b000_val);	break;
+				case 0x81: ay8910_write_port_2_w(machine,0,b000_val);	break;
 
 			}
 		break;
diff --git a/src/mame/drivers/exedexes.c b/src/mame/drivers/exedexes.c
index b1550eea6aa..76f0248b8a7 100644
--- a/src/mame/drivers/exedexes.c
+++ b/src/mame/drivers/exedexes.c
@@ -79,8 +79,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x8002, 0x8002) AM_WRITE(sn76496_0_w)
 	AM_RANGE(0x8003, 0x8003) AM_WRITE(sn76496_1_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/exerion.c b/src/mame/drivers/exerion.c
index c89572d3052..17515ad2181 100644
--- a/src/mame/drivers/exerion.c
+++ b/src/mame/drivers/exerion.c
@@ -99,11 +99,11 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xb000, 0xb000) AM_READ_PORT("DSW1")
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(exerion_videoreg_w)
 	AM_RANGE(0xc800, 0xc800) AM_WRITE(soundlatch_w)
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xd800, 0xd800) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xd801, 0xd801) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0xd802, 0xd802) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xd800, 0xd800) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xd801, 0xd801) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0xd802, 0xd802) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/exprraid.c b/src/mame/drivers/exprraid.c
index 46261d1366e..f01566755e4 100644
--- a/src/mame/drivers/exprraid.c
+++ b/src/mame/drivers/exprraid.c
@@ -133,10 +133,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
     AM_RANGE(0x0000, 0x1fff) AM_RAM
-    AM_RANGE(0x2000, 0x2000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-    AM_RANGE(0x4000, 0x4000) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-    AM_RANGE(0x4001, 0x4001) AM_WRITE(YM3526_write_port_0_w)
+    AM_RANGE(0x2000, 0x2000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+    AM_RANGE(0x4000, 0x4000) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+    AM_RANGE(0x4001, 0x4001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
     AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/exterm.c b/src/mame/drivers/exterm.c
index 86d76fb8a59..c254bb514e6 100644
--- a/src/mame/drivers/exterm.c
+++ b/src/mame/drivers/exterm.c
@@ -244,9 +244,9 @@ static WRITE8_HANDLER( ym2151_data_latch_w )
 {
 	/* bit 7 of the sound control selects which port */
 	if (sound_control & 0x80)
-		YM2151_data_port_0_w(machine, offset, data);
+		ym2151_data_port_0_w(machine, offset, data);
 	else
-		YM2151_register_port_0_w(machine, offset, data);
+		ym2151_register_port_0_w(machine, offset, data);
 }
 
 
@@ -280,7 +280,7 @@ static WRITE8_HANDLER( sound_slave_dac_w )
 {
 	/* DAC A is used to modulate DAC B */
 	dac_value[offset & 1] = data;
-	DAC_data_16_w(0, (dac_value[0] ^ 0xff) * dac_value[1]);
+	dac_data_16_w(0, (dac_value[0] ^ 0xff) * dac_value[1]);
 }
 
 
diff --git a/src/mame/drivers/exzisus.c b/src/mame/drivers/exzisus.c
index 56f5d5ec710..895a2e51308 100644
--- a/src/mame/drivers/exzisus.c
+++ b/src/mame/drivers/exzisus.c
@@ -224,7 +224,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
 	AM_RANGE(0x9000, 0x9000) AM_READ(SMH_NOP)
-	AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x9001, 0x9001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -232,8 +232,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/f-32.c b/src/mame/drivers/f-32.c
index 2d1c9955dac..42f92f38aed 100644
--- a/src/mame/drivers/f-32.c
+++ b/src/mame/drivers/f-32.c
@@ -30,17 +30,17 @@ static WRITE32_HANDLER( oki_32bit_w )
 
 static READ32_HANDLER( ym2151_status_32bit_r )
 {
-	return YM2151_status_port_0_r(machine, 0);
+	return ym2151_status_port_0_r(machine, 0);
 }
 
 static WRITE32_HANDLER( ym2151_data_32bit_w )
 {
-	YM2151_data_port_0_w(machine, 0, data & 0xff);
+	ym2151_data_port_0_w(machine, 0, data & 0xff);
 }
 
 static WRITE32_HANDLER( ym2151_register_32bit_w )
 {
-	YM2151_register_port_0_w(machine,0,data & 0xff);
+	ym2151_register_port_0_w(machine,0,data & 0xff);
 }
 
 static READ32_HANDLER( eeprom_r )
diff --git a/src/mame/drivers/f1gp.c b/src/mame/drivers/f1gp.c
index 5fc19b53d9d..f6cc290888d 100644
--- a/src/mame/drivers/f1gp.c
+++ b/src/mame/drivers/f1gp.c
@@ -194,8 +194,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x14, 0x14) AM_READ(soundlatch_r)
-	AM_RANGE(0x18, 0x18) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x1a, 0x1a) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x18, 0x18) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x1a, 0x1a) AM_READ(ym2610_status_port_0_b_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
@@ -203,10 +203,10 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_WRITE(f1gp_sh_bankswitch_w)	// f1gp
 	AM_RANGE(0x0c, 0x0c) AM_WRITE(f1gp_sh_bankswitch_w)	// f1gp2
 	AM_RANGE(0x14, 0x14) AM_WRITE(pending_command_clear_w)
-	AM_RANGE(0x18, 0x18) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x19, 0x19) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x1a, 0x1a) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x1b, 0x1b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x18, 0x18) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x19, 0x19) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x1a, 0x1a) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x1b, 0x1b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 static WRITE16_HANDLER( f1gpb_misc_w )
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index c20a666e7b9..ed35fbbc54f 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -276,9 +276,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fantland_sound_iomap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x0080, 0x0080 ) AM_READ( soundlatch_r )
-	AM_RANGE( 0x0100, 0x0100 ) AM_WRITE( YM2151_register_port_0_w )
-	AM_RANGE( 0x0101, 0x0101 ) AM_READWRITE( YM2151_status_port_0_r, YM2151_data_port_0_w )
-	AM_RANGE( 0x0180, 0x0180 ) AM_WRITE( DAC_0_data_w )
+	AM_RANGE( 0x0100, 0x0100 ) AM_WRITE( ym2151_register_port_0_w )
+	AM_RANGE( 0x0101, 0x0101 ) AM_READWRITE( ym2151_status_port_0_r, ym2151_data_port_0_w )
+	AM_RANGE( 0x0180, 0x0180 ) AM_WRITE( dac_0_data_w )
 ADDRESS_MAP_END
 
 
@@ -383,8 +383,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( wheelrun_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0xa000, 0xa000) AM_READWRITE( YM3526_status_port_0_r, YM3526_control_port_0_w )
-	AM_RANGE(0xa001, 0xa001) AM_WRITE( YM3526_write_port_0_w )
+	AM_RANGE(0xa000, 0xa000) AM_READWRITE( ym3526_status_port_0_r, ym3526_control_port_0_w )
+	AM_RANGE(0xa001, 0xa001) AM_WRITE( ym3526_write_port_0_w )
 
 	AM_RANGE(0xb000, 0xb000) AM_WRITE( SMH_NOP )	// on a car crash / hit
 	AM_RANGE(0xc000, 0xc000) AM_WRITE( SMH_NOP )	// ""
diff --git a/src/mame/drivers/fastfred.c b/src/mame/drivers/fastfred.c
index acc596dbe77..2d9b3c2b0c7 100644
--- a/src/mame/drivers/fastfred.c
+++ b/src/mame/drivers/fastfred.c
@@ -156,8 +156,8 @@ static ADDRESS_MAP_START( jumpcoas_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xf116, 0xf116) AM_WRITE(fastfred_flip_screen_x_w)
 	AM_RANGE(0xf117, 0xf117) AM_WRITE(fastfred_flip_screen_y_w)
 	//AM_RANGE(0xf800, 0xf800) AM_READ(watchdog_reset_r)  // Why doesn't this work???
-	AM_RANGE(0xf800, 0xf800) AM_READWRITE(SMH_NOP, AY8910_control_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_READWRITE(SMH_NOP, ay8910_control_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -189,10 +189,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2000, 0x23ff) AM_RAM
 	AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r, interrupt_enable_w)
 	AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_RAM)  // Reset PSG's
-	AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x5001, 0x5001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x5000, 0x5000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x5001, 0x5001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x7000, 0x7000) AM_READ(SMH_NOP) // only for Imago, read but not used
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/fcombat.c b/src/mame/drivers/fcombat.c
index 514e413fe1f..b379b8bb55d 100644
--- a/src/mame/drivers/fcombat.c
+++ b/src/mame/drivers/fcombat.c
@@ -219,15 +219,15 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x47ff) AM_RAM
 	AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
-	AM_RANGE(0x8001, 0x8001) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x8002, 0x8002) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8003, 0x8003) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0xa002, 0xa002) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0xa003, 0xa003) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xc001, 0xc001) AM_READ(AY8910_read_port_2_r)
-	AM_RANGE(0xc002, 0xc002) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0xc003, 0xc003) AM_WRITE(AY8910_control_port_2_w)
+	AM_RANGE(0x8001, 0x8001) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x8002, 0x8002) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8003, 0x8003) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0xa002, 0xa002) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0xa003, 0xa003) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ay8910_read_port_2_r)
+	AM_RANGE(0xc002, 0xc002) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0xc003, 0xc003) AM_WRITE(ay8910_control_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/fcrash.c b/src/mame/drivers/fcrash.c
index b3217bf3fab..df1883d6c4a 100644
--- a/src/mame/drivers/fcrash.c
+++ b/src/mame/drivers/fcrash.c
@@ -363,10 +363,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
 	AM_RANGE(0xd000, 0xd7ff) AM_RAM
-	AM_RANGE(0xd800, 0xd800) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xd801, 0xd801) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0xdc00, 0xdc00) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0xdc01, 0xdc01) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0xd800, 0xd800) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xd801, 0xd801) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0xdc00, 0xdc00) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0xdc01, 0xdc01) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(fcrash_snd_bankswitch_w)
 	AM_RANGE(0xe400, 0xe400) AM_READ(soundlatch_r)
 	AM_RANGE(0xe800, 0xe800) AM_WRITE(fcrash_msm5205_0_data_w)
diff --git a/src/mame/drivers/finalizr.c b/src/mame/drivers/finalizr.c
index fffb015bd75..84ee48f180f 100644
--- a/src/mame/drivers/finalizr.c
+++ b/src/mame/drivers/finalizr.c
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( i8039_writeport, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(i8039_irqen_w)
 	AM_RANGE(I8039_t0, I8039_t0) AM_WRITE(i8039_T0_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/findout.c b/src/mame/drivers/findout.c
index fcc2ecf30a7..b977a717d27 100644
--- a/src/mame/drivers/findout.c
+++ b/src/mame/drivers/findout.c
@@ -96,7 +96,7 @@ static WRITE8_HANDLER( sound_w )
 	interrupt_enable_w(machine, 0,data & 0x40);
 
 	/* bit 7 goes directly to the sound amplifier */
-	DAC_data_w(0,((data & 0x80) >> 7) * 255);
+	dac_data_w(0,((data & 0x80) >> 7) * 255);
 
 //  logerror("%04x: sound_w %02x\n",activecpu_get_pc(),data);
 //  popmessage("%02x",data);
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index 41685e1d6a6..47efa6bc376 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1338,11 +1338,11 @@ static READ32_HANDLER( sound_r )
 
 	if (ACCESSING_BITS_24_31)	/* External RAM read */
 	{
-		r |= YMZ280B_data_0_r(machine, offset) << 24;
+		r |= ymz280b_data_0_r(machine, offset) << 24;
 	}
 	if (ACCESSING_BITS_16_23)
 	{
-		r |= YMZ280B_status_0_r(machine, offset) << 16;
+		r |= ymz280b_status_0_r(machine, offset) << 16;
 	}
 
 	return r;
@@ -1353,11 +1353,11 @@ static WRITE32_HANDLER( sound_w )
 //  printf("sound_w: %08X, %08X, %08X\n", offset, data, mem_mask);
 	if (ACCESSING_BITS_24_31)
 	{
-		YMZ280B_register_0_w(machine, offset, (data >> 24) & 0xff);
+		ymz280b_register_0_w(machine, offset, (data >> 24) & 0xff);
 	}
 	if (ACCESSING_BITS_16_23)
 	{
-		YMZ280B_data_0_w(machine, offset, (data >> 16) & 0xff);
+		ymz280b_data_0_w(machine, offset, (data >> 16) & 0xff);
 	}
 }
 
@@ -1824,7 +1824,7 @@ static void sound_irq_callback(running_machine *machine, int state)
 {
 }
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	sound_irq_callback,			// irq
 	soundram_r,
diff --git a/src/mame/drivers/firetrap.c b/src/mame/drivers/firetrap.c
index fdb20a50609..0cf5333abe7 100644
--- a/src/mame/drivers/firetrap.c
+++ b/src/mame/drivers/firetrap.c
@@ -316,8 +316,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x2000, 0x2000) AM_WRITE(firetrap_adpcm_data_w)	/* ADPCM data for the MSM5205 chip */
 	AM_RANGE(0x2400, 0x2400) AM_WRITE(firetrap_sound_2400_w)
 	AM_RANGE(0x2800, 0x2800) AM_WRITE(firetrap_sound_bankselect_w)
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index f3180364b9c..dbd49e751c2 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -134,7 +134,7 @@ static ADDRESS_MAP_START( flkatck_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9004, 0x9004) AM_READ(SMH_RAM)				/* ??? */
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)			/* soundlatch_r */
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)	/* 007232 registers */
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r) /* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r) /* YM2151 */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( flkatck_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
@@ -144,8 +144,8 @@ static ADDRESS_MAP_START( flkatck_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 //  AM_RANGE(0x9001, 0x9001) AM_WRITE(SMH_RAM)                  /* ??? */
 	AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_RAM)					/* ??? */
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w) 	/* 007232 registers */
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)	/* YM2151 */
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)		/* YM2151 */
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)	/* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)		/* YM2151 */
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/flstory.c b/src/mame/drivers/flstory.c
index bce3ca665a2..c46393ed564 100644
--- a/src/mame/drivers/flstory.c
+++ b/src/mame/drivers/flstory.c
@@ -230,15 +230,15 @@ static WRITE8_HANDLER( sound_control_3_w ) /* unknown */
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xca00, 0xca0d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0xcc00, 0xcc00) AM_WRITE(sound_control_0_w)
 	AM_RANGE(0xce00, 0xce00) AM_WRITE(sound_control_1_w)
 	AM_RANGE(0xd800, 0xd800) AM_READWRITE(soundlatch_r, to_main_w)
 	AM_RANGE(0xda00, 0xda00) AM_READWRITE(SMH_NOP, nmi_enable_w)			/* unknown read*/
 	AM_RANGE(0xdc00, 0xdc00) AM_WRITE(nmi_disable_w)
-	AM_RANGE(0xde00, 0xde00) AM_READWRITE(SMH_NOP, DAC_0_signed_data_w)	/* signed 8-bit DAC &  unknown read */
+	AM_RANGE(0xde00, 0xde00) AM_READWRITE(SMH_NOP, dac_0_signed_data_w)	/* signed 8-bit DAC &  unknown read */
 	AM_RANGE(0xe000, 0xefff) AM_ROM											/* space for diagnostics ROM */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c
index 0a64f02a523..ea6c5565b78 100644
--- a/src/mame/drivers/fromanc2.c
+++ b/src/mame/drivers/fromanc2.c
@@ -492,18 +492,18 @@ static ADDRESS_MAP_START( fromanc2_readport_sound, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)					// snd cmd (1P)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch2_r)					// snd cmd (2P)
 	AM_RANGE(0x09, 0x09) AM_READ(SMH_NOP)						// ?
-	AM_RANGE(0x08, 0x08) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x0a, 0x0a) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x08, 0x08) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x0a, 0x0a) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0x0c, 0x0c) AM_READ(fromanc2_sndcpu_nmi_clr)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fromanc2_writeport_sound, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP)						// ?
-	AM_RANGE(0x08, 0x08) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c
index 42e89fa6c4c..818b4fde917 100644
--- a/src/mame/drivers/fromance.c
+++ b/src/mame/drivers/fromance.c
@@ -343,8 +343,8 @@ static ADDRESS_MAP_START( nekkyoku_writeport_sub, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0xe6, 0xe6) AM_WRITE(fromance_busycheck_sub_w)
 	AM_RANGE(0xe7, 0xe7) AM_WRITE(fromance_adpcm_reset_w)
 	AM_RANGE(0xe8, 0xe8) AM_WRITE(fromance_adpcm_w)
-	AM_RANGE(0xe9, 0xe9) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xea, 0xea) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xe9, 0xe9) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xea, 0xea) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fromance_readport_sub, ADDRESS_SPACE_IO, 8 )
@@ -364,8 +364,8 @@ static ADDRESS_MAP_START( idolmj_writeport_sub, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x26, 0x26) AM_WRITE(fromance_busycheck_sub_w)
 	AM_RANGE(0x27, 0x27) AM_WRITE(fromance_adpcm_reset_w)
 	AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w)
-	AM_RANGE(0x29, 0x29) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x2a, 0x2a) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x29, 0x29) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x2a, 0x2a) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fromance_writeport_sub, ADDRESS_SPACE_IO, 8 )
@@ -378,8 +378,8 @@ static ADDRESS_MAP_START( fromance_writeport_sub, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x26, 0x26) AM_WRITE(fromance_busycheck_sub_w)
 	AM_RANGE(0x27, 0x27) AM_WRITE(fromance_adpcm_reset_w)
 	AM_RANGE(0x28, 0x28) AM_WRITE(fromance_adpcm_w)
-	AM_RANGE(0x2a, 0x2a) AM_WRITE(YM2413_register_port_0_w)
-	AM_RANGE(0x2b, 0x2b) AM_WRITE(YM2413_data_port_0_w)
+	AM_RANGE(0x2a, 0x2a) AM_WRITE(ym2413_register_port_0_w)
+	AM_RANGE(0x2b, 0x2b) AM_WRITE(ym2413_data_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/funkybee.c b/src/mame/drivers/funkybee.c
index 5daf4fd7b5f..aa3e3d6e3b6 100644
--- a/src/mame/drivers/funkybee.c
+++ b/src/mame/drivers/funkybee.c
@@ -122,13 +122,13 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c
index 5160f8724c0..131028783a5 100644
--- a/src/mame/drivers/funkyjet.c
+++ b/src/mame/drivers/funkyjet.c
@@ -134,7 +134,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
@@ -144,7 +144,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP) /* YM2203 - this board doesn't have one */
-	AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c
index 8ede8914f68..29730da926a 100644
--- a/src/mame/drivers/funworld.c
+++ b/src/mame/drivers/funworld.c
@@ -938,8 +938,8 @@ static ADDRESS_MAP_START( funworld_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x0800, 0x0803) AM_READWRITE(pia_0_r, pia_0_w)
 	AM_RANGE(0x0a00, 0x0a03) AM_READWRITE(pia_1_r, pia_1_w)
-	AM_RANGE(0x0c00, 0x0c00) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x0c01, 0x0c01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x0c00, 0x0c00) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x0c01, 0x0c01) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x2000, 0x2fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram)
@@ -953,8 +953,8 @@ static ADDRESS_MAP_START( magiccrd_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x0800, 0x0803) AM_READWRITE(pia_0_r, pia_0_w)
 	AM_RANGE(0x0a00, 0x0a03) AM_READWRITE(pia_1_r, pia_1_w)
-	AM_RANGE(0x0c00, 0x0c00) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x0c01, 0x0c01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x0c00, 0x0c00) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x0c01, 0x0c01) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x2c00, 0x2cff) AM_RAM	/* range for protection */
@@ -969,8 +969,8 @@ static ADDRESS_MAP_START( cuoreuno_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x0800, 0x0803) AM_READWRITE(pia_0_r, pia_0_w)
 	AM_RANGE(0x0a00, 0x0a03) AM_READWRITE(pia_1_r, pia_1_w)
-	AM_RANGE(0x0c00, 0x0c00) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x0c01, 0x0c01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x0c00, 0x0c00) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x0c01, 0x0c01) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x0e00, 0x0e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x0e01, 0x0e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x2000, 0x2000) AM_READNOP	/* some unknown reads */
@@ -984,8 +984,8 @@ static ADDRESS_MAP_START( royalmcu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x2800, 0x2803) AM_READWRITE(pia_0_r, pia_0_w)
 	AM_RANGE(0x2a00, 0x2a03) AM_READWRITE(pia_1_r, pia_1_w)
-	AM_RANGE(0x2c00, 0x2c00) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x2c01, 0x2c01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x2c00, 0x2c00) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x2c01, 0x2c01) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x2e00, 0x2e00) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w)
 	AM_RANGE(0x2e01, 0x2e01) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w)
 	AM_RANGE(0x4000, 0x4fff) AM_RAM_WRITE(funworld_videoram_w) AM_BASE(&videoram)
diff --git a/src/mame/drivers/fuukifg2.c b/src/mame/drivers/fuukifg2.c
index bdc72e26e27..7453ca49330 100644
--- a/src/mame/drivers/fuukifg2.c
+++ b/src/mame/drivers/fuukifg2.c
@@ -158,7 +158,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( fuuki16_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x11, 0x11) AM_READ(soundlatch_r				)	// From Main CPU
-	AM_RANGE(0x50, 0x50) AM_READ(YM3812_status_port_0_r		)	// YM3812
+	AM_RANGE(0x50, 0x50) AM_READ(ym3812_status_port_0_r		)	// YM3812
 	AM_RANGE(0x60, 0x60) AM_READ(okim6295_status_0_r		)	// M6295
 ADDRESS_MAP_END
 
@@ -168,10 +168,10 @@ static ADDRESS_MAP_START( fuuki16_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP					)	// ? To Main CPU
 	AM_RANGE(0x20, 0x20) AM_WRITE(fuuki16_oki_banking_w		)	// Oki Banking
 	AM_RANGE(0x30, 0x30) AM_WRITE(SMH_NOP					)	// ? In the NMI routine
-	AM_RANGE(0x40, 0x40) AM_WRITE(YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE(0x41, 0x41) AM_WRITE(YM2203_write_port_0_w		)
-	AM_RANGE(0x50, 0x50) AM_WRITE(YM3812_control_port_0_w	)	// YM3812
-	AM_RANGE(0x51, 0x51) AM_WRITE(YM3812_write_port_0_w		)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE(0x41, 0x41) AM_WRITE(ym2203_write_port_0_w		)
+	AM_RANGE(0x50, 0x50) AM_WRITE(ym3812_control_port_0_w	)	// YM3812
+	AM_RANGE(0x51, 0x51) AM_WRITE(ym3812_write_port_0_w		)
 	AM_RANGE(0x61, 0x61) AM_WRITE(okim6295_data_0_w			)	// M6295
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/fuukifg3.c b/src/mame/drivers/fuukifg3.c
index 8b172d5ca10..c8d0c738db0 100644
--- a/src/mame/drivers/fuukifg3.c
+++ b/src/mame/drivers/fuukifg3.c
@@ -363,19 +363,19 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fuuki32_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_READ(YMF262_status_0_r)
+	AM_RANGE(0x40, 0x40) AM_READ(ymf262_status_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fuuki32_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(fuuki32_sound_bw_w)
 	AM_RANGE(0x30, 0x30) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x40, 0x40) AM_WRITE(YMF262_register_A_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(YMF262_data_A_0_w)
-	AM_RANGE(0x42, 0x42) AM_WRITE(YMF262_register_B_0_w)
-	AM_RANGE(0x43, 0x43) AM_WRITE(YMF262_data_B_0_w)
-	AM_RANGE(0x44, 0x44) AM_WRITE(YMF278B_control_port_0_C_w)
-	AM_RANGE(0x45, 0x45) AM_WRITE(YMF278B_data_port_0_C_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ymf262_register_a_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ymf262_data_a_0_w)
+	AM_RANGE(0x42, 0x42) AM_WRITE(ymf262_register_b_0_w)
+	AM_RANGE(0x43, 0x43) AM_WRITE(ymf262_data_b_0_w)
+	AM_RANGE(0x44, 0x44) AM_WRITE(ymf278b_control_port_0_c_w)
+	AM_RANGE(0x45, 0x45) AM_WRITE(ymf278b_data_port_0_c_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/gaelco.c b/src/mame/drivers/gaelco.c
index 680b5907d79..b105dfb0c8d 100644
--- a/src/mame/drivers/gaelco.c
+++ b/src/mame/drivers/gaelco.c
@@ -115,7 +115,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( bigkarnk_readmem_snd, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM)				/* RAM */
 	AM_RANGE(0x0800, 0x0801) AM_READ(okim6295_status_0_r)	/* OKI6295 */
-	AM_RANGE(0x0a00, 0x0a00) AM_READ(YM3812_status_port_0_r)	/* YM3812 */
+	AM_RANGE(0x0a00, 0x0a00) AM_READ(ym3812_status_port_0_r)	/* YM3812 */
 	AM_RANGE(0x0b00, 0x0b00) AM_READ(soundlatch_r)			/* Sound latch */
 	AM_RANGE(0x0c00, 0xffff) AM_READ(SMH_ROM)				/* ROM */
 ADDRESS_MAP_END
@@ -124,8 +124,8 @@ static ADDRESS_MAP_START( bigkarnk_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)				/* RAM */
 	AM_RANGE(0x0800, 0x0800) AM_WRITE(okim6295_data_0_w)		/* OKI6295 */
 //  AM_RANGE(0x0900, 0x0900) AM_WRITE(SMH_NOP)             /* enable sound output? */
-	AM_RANGE(0x0a00, 0x0a00) AM_WRITE(YM3812_control_port_0_w)/* YM3812 */
-	AM_RANGE(0x0a01, 0x0a01) AM_WRITE(YM3812_write_port_0_w)	/* YM3812 */
+	AM_RANGE(0x0a00, 0x0a00) AM_WRITE(ym3812_control_port_0_w)/* YM3812 */
+	AM_RANGE(0x0a01, 0x0a01) AM_WRITE(ym3812_write_port_0_w)	/* YM3812 */
 	AM_RANGE(0x0c00, 0xffff) AM_WRITE(SMH_ROM)				/* ROM */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index a02b5e79142..32d966ba45f 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -443,10 +443,10 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM) 	/* raiga only */
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xf800, 0xf800) AM_WRITE(okim6295_data_0_w)
-	AM_RANGE(0xf810, 0xf810) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xf811, 0xf811) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xf820, 0xf820) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xf821, 0xf821) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xf810, 0xf810) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xf811, 0xf811) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xf820, 0xf820) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xf821, 0xf821) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP)	/* ?? */
 ADDRESS_MAP_END
 
@@ -457,8 +457,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( drgnbowl_sound_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c
index 241b339da7a..dfd26568a20 100644
--- a/src/mame/drivers/galaxian.c
+++ b/src/mame/drivers/galaxian.c
@@ -297,8 +297,8 @@ static READ8_HANDLER( konami_ay8910_r )
 {
 	/* the decoding here is very simplistic, and you can address both simultaneously */
 	UINT8 result = 0xff;
-	if (offset & 0x20) result &= AY8910_read_port_0_r(machine, 0);
-	if (offset & 0x80) result &= AY8910_read_port_1_r(machine, 0);
+	if (offset & 0x20) result &= ay8910_read_port_0_r(machine, 0);
+	if (offset & 0x80) result &= ay8910_read_port_1_r(machine, 0);
 	return result;
 }
 
@@ -307,14 +307,14 @@ static WRITE8_HANDLER( konami_ay8910_w )
 {
 	/* the decoding here is very simplistic, and you can address two simultaneously */
 	if (offset & 0x10)
-		AY8910_control_port_0_w(machine, 0, data);
+		ay8910_control_port_0_w(machine, 0, data);
 	else if (offset & 0x20)
-		AY8910_write_port_0_w(machine, 0, data);
+		ay8910_write_port_0_w(machine, 0, data);
 
 	if (offset & 0x40)
-		AY8910_control_port_1_w(machine, 0, data);
+		ay8910_control_port_1_w(machine, 0, data);
 	else if (offset & 0x80)
-		AY8910_write_port_1_w(machine, 0, data);
+		ay8910_write_port_1_w(machine, 0, data);
 }
 
 
@@ -607,7 +607,7 @@ static WRITE8_HANDLER( sfx_sample_io_w )
 {
 	/* the decoding here is very simplistic, and you can address both simultaneously */
 	if (offset & 0x04) ppi8255_w(device_list_find_by_tag( machine->config->devicelist, PPI8255, "ppi8255_2" ), offset & 3, data);
-	if (offset & 0x10) DAC_0_signed_data_w(machine, offset, data);
+	if (offset & 0x10) dac_0_signed_data_w(machine, offset, data);
 }
 
 
@@ -681,7 +681,7 @@ static READ8_HANDLER( frogger_ay8910_r )
 {
 	/* the decoding here is very simplistic */
 	UINT8 result = 0xff;
-	if (offset & 0x40) result &= AY8910_read_port_0_r(machine, 0);
+	if (offset & 0x40) result &= ay8910_read_port_0_r(machine, 0);
 	return result;
 }
 
@@ -690,9 +690,9 @@ static WRITE8_HANDLER( frogger_ay8910_w )
 {
 	/* the decoding here is very simplistic */
 	if (offset & 0x40)
-		AY8910_write_port_0_w(machine, 0, data);
+		ay8910_write_port_0_w(machine, 0, data);
 	else if (offset & 0x80)
-		AY8910_control_port_0_w(machine, 0, data);
+		ay8910_control_port_0_w(machine, 0, data);
 }
 
 
@@ -759,9 +759,9 @@ static READ8_HANDLER( scorpion_ay8910_r )
 {
 	/* the decoding here is very simplistic, and you can address both simultaneously */
 	UINT8 result = 0xff;
-	if (offset & 0x08) result &= AY8910_read_port_2_r(machine, 0);
-	if (offset & 0x20) result &= AY8910_read_port_0_r(machine, 0);
-	if (offset & 0x80) result &= AY8910_read_port_1_r(machine, 0);
+	if (offset & 0x08) result &= ay8910_read_port_2_r(machine, 0);
+	if (offset & 0x20) result &= ay8910_read_port_0_r(machine, 0);
+	if (offset & 0x80) result &= ay8910_read_port_1_r(machine, 0);
 	return result;
 }
 
@@ -769,12 +769,12 @@ static READ8_HANDLER( scorpion_ay8910_r )
 static WRITE8_HANDLER( scorpion_ay8910_w )
 {
 	/* the decoding here is very simplistic, and you can address all six simultaneously */
-	if (offset & 0x04) AY8910_control_port_2_w(machine, 0, data);
-	if (offset & 0x08) AY8910_write_port_2_w(machine, 0, data);
-	if (offset & 0x10) AY8910_control_port_0_w(machine, 0, data);
-	if (offset & 0x20) AY8910_write_port_0_w(machine, 0, data);
-	if (offset & 0x40) AY8910_control_port_1_w(machine, 0, data);
-	if (offset & 0x80) AY8910_write_port_1_w(machine, 0, data);
+	if (offset & 0x04) ay8910_control_port_2_w(machine, 0, data);
+	if (offset & 0x08) ay8910_write_port_2_w(machine, 0, data);
+	if (offset & 0x10) ay8910_control_port_0_w(machine, 0, data);
+	if (offset & 0x20) ay8910_write_port_0_w(machine, 0, data);
+	if (offset & 0x40) ay8910_control_port_1_w(machine, 0, data);
+	if (offset & 0x80) ay8910_write_port_1_w(machine, 0, data);
 }
 
 
@@ -909,9 +909,9 @@ static WRITE8_HANDLER( zigzag_ay8910_w )
 			if ((offset & 1) != 0)
 			{
 				if ((offset & 2) == 0)
-					AY8910_write_port_0_w(machine, 0, zigzag_ay8910_latch);
+					ay8910_write_port_0_w(machine, 0, zigzag_ay8910_latch);
 				else
-					AY8910_control_port_0_w(machine, 0, zigzag_ay8910_latch);
+					ay8910_control_port_0_w(machine, 0, zigzag_ay8910_latch);
 			}
 			break;
 
@@ -984,7 +984,7 @@ static WRITE8_HANDLER( kingball_sound2_w )
 
 static WRITE8_HANDLER( kingball_dac_w )
 {
-	DAC_0_data_w(machine, offset, data ^ 0xff);
+	dac_0_data_w(machine, offset, data ^ 0xff);
 }
 
 
@@ -1004,21 +1004,21 @@ static WRITE8_HANDLER( mshuttle_ay8910_cs_w )
 static WRITE8_HANDLER( mshuttle_ay8910_control_w )
 {
 	if (!mshuttle_ay8910_cs)
-		AY8910_control_port_0_w(machine, offset, data);
+		ay8910_control_port_0_w(machine, offset, data);
 }
 
 
 static WRITE8_HANDLER( mshuttle_ay8910_data_w )
 {
 	if (!mshuttle_ay8910_cs)
-		AY8910_write_port_0_w(machine, offset, data);
+		ay8910_write_port_0_w(machine, offset, data);
 }
 
 
 static READ8_HANDLER( mshuttle_ay8910_data_r )
 {
 	if (!mshuttle_ay8910_cs)
-		return AY8910_read_port_0_r(machine, offset);
+		return ay8910_read_port_0_r(machine, offset);
 	return 0xff;
 }
 
@@ -1399,8 +1399,8 @@ static ADDRESS_MAP_START( jumpbug_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x47ff) AM_RAM
 	AM_RANGE(0x4800, 0x4bff) AM_MIRROR(0x0400) AM_RAM_WRITE(galaxian_videoram_w) AM_BASE(&videoram)
 	AM_RANGE(0x5000, 0x50ff) AM_MIRROR(0x0700) AM_RAM_WRITE(galaxian_objram_w) AM_BASE(&spriteram)
-	AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x5800, 0x5800) AM_MIRROR(0x00ff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x5900, 0x5900) AM_MIRROR(0x00ff) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x07ff) AM_READ_PORT("IN0")
 	AM_RANGE(0x6002, 0x6006) AM_MIRROR(0x07f8) AM_WRITE(galaxian_gfxbank_w)
 	AM_RANGE(0x6800, 0x6800) AM_MIRROR(0x07ff) AM_READ_PORT("IN1")
@@ -1505,9 +1505,9 @@ static ADDRESS_MAP_START( checkman_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x03, 0x03) AM_READ(soundlatch_r)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
@@ -1516,9 +1516,9 @@ static ADDRESS_MAP_START( checkmaj_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x8000, 0x83ff) AM_RAM
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xa002, 0xa002) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xa002, 0xa002) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c
index cb7eb7b8808..8e932e8419d 100644
--- a/src/mame/drivers/galaxold.c
+++ b/src/mame/drivers/galaxold.c
@@ -712,8 +712,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ozon1_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( drivfrcg, ADDRESS_SPACE_PROGRAM, 8 )
@@ -764,9 +764,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bongo_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
@@ -822,12 +822,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( harem_cpu2_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_write_port_2_w)
 	AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/galivan.c b/src/mame/drivers/galivan.c
index 74f8d7d861e..de9fbe3a222 100644
--- a/src/mame/drivers/galivan.c
+++ b/src/mame/drivers/galivan.c
@@ -182,10 +182,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3526_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(DAC_0_data_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(DAC_1_data_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3526_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(dac_0_data_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(dac_1_data_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/galpani3.c b/src/mame/drivers/galpani3.c
index b3b0f310895..81a6ecd22a9 100644
--- a/src/mame/drivers/galpani3.c
+++ b/src/mame/drivers/galpani3.c
@@ -357,13 +357,13 @@ static ADDRESS_MAP_START( galpani3_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xf00014, 0xf00015) AM_READ(input_port_2_word_r)
 	AM_RANGE(0xf00016, 0xf00017) AM_NOP // ? read, but overwritten
 
-	AM_RANGE(0xf00020, 0xf00021) AM_WRITE(YMZ280B_register_0_lsb_w)	// sound
-	AM_RANGE(0xf00022, 0xf00023) AM_WRITE(YMZ280B_data_0_lsb_w)		//
+	AM_RANGE(0xf00020, 0xf00021) AM_WRITE(ymz280b_register_0_lsb_w)	// sound
+	AM_RANGE(0xf00022, 0xf00023) AM_WRITE(ymz280b_data_0_lsb_w)		//
 	AM_RANGE(0xf00040, 0xf00041) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w)	// watchdog
 ADDRESS_MAP_END
 
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	0	// irq ?
 };
diff --git a/src/mame/drivers/galspnbl.c b/src/mame/drivers/galspnbl.c
index 8062e60edb4..42fc38dc83b 100644
--- a/src/mame/drivers/galspnbl.c
+++ b/src/mame/drivers/galspnbl.c
@@ -71,8 +71,8 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xf800, 0xf800) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
-	AM_RANGE(0xf810, 0xf810) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xf811, 0xf811) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xf810, 0xf810) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xf811, 0xf811) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_READWRITE(SMH_NOP, SMH_NOP)	/* irq ack ?? */
 	AM_RANGE(0xfc20, 0xfc20) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/gameplan.c b/src/mame/drivers/gameplan.c
index 5b04fd7ae39..83a5824d166 100644
--- a/src/mame/drivers/gameplan.c
+++ b/src/mame/drivers/gameplan.c
@@ -252,9 +252,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( gameplan_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM  /* 6532 internal RAM */
 	AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w)
-	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe000, 0xe7ff) AM_MIRROR(0x1800) AM_ROM
 ADDRESS_MAP_END
 
@@ -263,9 +263,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( leprechn_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x007f) AM_MIRROR(0x1780) AM_RAM  /* 6532 internal RAM */
 	AM_RANGE(0x0800, 0x081f) AM_MIRROR(0x17e0) AM_DEVREADWRITE(RIOT6532, "riot", riot6532_r, riot6532_w)
-	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_MIRROR(0x1ffc) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa002, 0xa002) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe000, 0xefff) AM_MIRROR(0x1000) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/gauntlet.c b/src/mame/drivers/gauntlet.c
index ce093d6895b..db1a1f3943a 100644
--- a/src/mame/drivers/gauntlet.c
+++ b/src/mame/drivers/gauntlet.c
@@ -361,8 +361,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1020, 0x102f) AM_MIRROR(0x27c0) AM_READWRITE(input_port_5_r, mixer_w)
 	AM_RANGE(0x1030, 0x103f) AM_MIRROR(0x27c0) AM_READWRITE(switch_6502_r, sound_ctl_w)
 	AM_RANGE(0x1800, 0x180f) AM_MIRROR(0x27c0) AM_READWRITE(pokey1_r, pokey1_w)
-	AM_RANGE(0x1810, 0x1810) AM_MIRROR(0x27ce) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x1811, 0x1811) AM_MIRROR(0x27ce) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x1810, 0x1810) AM_MIRROR(0x27ce) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x1811, 0x1811) AM_MIRROR(0x27ce) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x1820, 0x182f) AM_MIRROR(0x27c0) AM_WRITE(tms5220_w)
 	AM_RANGE(0x1830, 0x183f) AM_MIRROR(0x27c0) AM_READWRITE(atarigen_6502_irq_ack_r, atarigen_6502_irq_ack_w)
 	AM_RANGE(0x4000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/gbusters.c b/src/mame/drivers/gbusters.c
index fdb1ca93969..45a77e0cb17 100644
--- a/src/mame/drivers/gbusters.c
+++ b/src/mame/drivers/gbusters.c
@@ -154,15 +154,15 @@ static ADDRESS_MAP_START( gbusters_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)				/* RAM */
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)			/* soundlatch_r */
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)	/* 007232 registers */
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)	/* YM 2151 */
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)	/* YM 2151 */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gbusters_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)					/* ROM 878h01.rom */
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)					/* RAM */
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w)		/* 007232 registers */
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)	/* YM 2151 */
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)		/* YM 2151 */
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)	/* YM 2151 */
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)		/* YM 2151 */
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(gbusters_snd_bankswitch_w)	/* 007232 bankswitch? */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/genesis.c b/src/mame/drivers/genesis.c
index 6da1bf52d2f..ef6bf2a605d 100644
--- a/src/mame/drivers/genesis.c
+++ b/src/mame/drivers/genesis.c
@@ -270,11 +270,11 @@ READ16_HANDLER ( genesis_68k_to_z80_r )
 		switch (offset & 3)
 		{
 		case 0:
-			if (ACCESSING_BITS_8_15)	 return YM3438_status_port_0_A_r(machine, 0) << 8;
-			else 				 return YM3438_read_port_0_r(machine, 0);
+			if (ACCESSING_BITS_8_15)	 return ym3438_status_port_0_a_r(machine, 0) << 8;
+			else 				 return ym3438_read_port_0_r(machine, 0);
 			break;
 		case 2:
-			if (ACCESSING_BITS_8_15)	return YM3438_status_port_0_B_r(machine, 0) << 8;
+			if (ACCESSING_BITS_8_15)	return ym3438_status_port_0_b_r(machine, 0) << 8;
 			else 				return 0;
 			break;
 		}
@@ -330,11 +330,11 @@ READ16_HANDLER ( megaplay_68k_to_z80_r )
 		switch (offset & 3)
 		{
 		case 0:
-			if (ACCESSING_BITS_8_15)	 return YM3438_status_port_0_A_r(machine, 0) << 8;
-			else 				 return YM3438_read_port_0_r(machine, 0);
+			if (ACCESSING_BITS_8_15)	 return ym3438_status_port_0_a_r(machine, 0) << 8;
+			else 				 return ym3438_read_port_0_r(machine, 0);
 			break;
 		case 2:
-			if (ACCESSING_BITS_8_15)	return YM3438_status_port_0_B_r(machine, 0) << 8;
+			if (ACCESSING_BITS_8_15)	return ym3438_status_port_0_b_r(machine, 0) << 8;
 			else 				return 0;
 			break;
 		}
@@ -382,12 +382,12 @@ WRITE16_HANDLER ( genesis_68k_to_z80_w )
 		switch (offset & 3)
 		{
 		case 0:
-			if (ACCESSING_BITS_8_15)	YM3438_control_port_0_A_w	(machine, 0,	(data >> 8) & 0xff);
-			else 				YM3438_data_port_0_A_w		(machine, 0,	(data >> 0) & 0xff);
+			if (ACCESSING_BITS_8_15)	ym3438_control_port_0_a_w	(machine, 0,	(data >> 8) & 0xff);
+			else 				ym3438_data_port_0_a_w		(machine, 0,	(data >> 0) & 0xff);
 			break;
 		case 2:
-			if (ACCESSING_BITS_8_15)	YM3438_control_port_0_B_w	(machine, 0,	(data >> 8) & 0xff);
-			else 				YM3438_data_port_0_B_w		(machine, 0,	(data >> 0) & 0xff);
+			if (ACCESSING_BITS_8_15)	ym3438_control_port_0_b_w	(machine, 0,	(data >> 8) & 0xff);
+			else 				ym3438_data_port_0_b_w		(machine, 0,	(data >> 0) & 0xff);
 			break;
 		}
 	}
@@ -548,9 +548,9 @@ READ8_HANDLER ( genesis_z80_r )
 	{
 		switch (offset & 3)
 		{
-		case 0: return YM3438_status_port_0_A_r(machine, 0);
-		case 1: return YM3438_read_port_0_r(machine, 0);
-		case 2: return YM3438_status_port_0_B_r(machine, 0);
+		case 0: return ym3438_status_port_0_a_r(machine, 0);
+		case 1: return ym3438_read_port_0_r(machine, 0);
+		case 2: return ym3438_status_port_0_b_r(machine, 0);
 		case 3: return 0;
 		}
 	}
@@ -585,13 +585,13 @@ WRITE8_HANDLER ( genesis_z80_w )
 	{
 		switch (offset & 3)
 		{
-		case 0: YM3438_control_port_0_A_w	(machine, 0,	data);
+		case 0: ym3438_control_port_0_a_w	(machine, 0,	data);
 			break;
-		case 1: YM3438_data_port_0_A_w		(machine, 0, data);
+		case 1: ym3438_data_port_0_a_w		(machine, 0, data);
 			break;
-		case 2: YM3438_control_port_0_B_w	(machine, 0,	data);
+		case 2: ym3438_control_port_0_b_w	(machine, 0,	data);
 			break;
-		case 3: YM3438_data_port_0_B_w		(machine, 0,	data);
+		case 3: ym3438_data_port_0_b_w		(machine, 0,	data);
 			break;
 		}
 	}
diff --git a/src/mame/drivers/getrivia.c b/src/mame/drivers/getrivia.c
index 067e2732346..fa01446155c 100644
--- a/src/mame/drivers/getrivia.c
+++ b/src/mame/drivers/getrivia.c
@@ -153,7 +153,7 @@ static WRITE8_HANDLER( sound_w )
 	interrupt_enable_w(machine,0,data & 0x40);
 
 	/* bit 7 goes directly to the sound amplifier */
-	DAC_data_w(0,((data & 0x80) >> 7) * 255);
+	dac_data_w(0,((data & 0x80) >> 7) * 255);
 }
 
 static WRITE8_HANDLER( sound2_w )
@@ -170,7 +170,7 @@ static WRITE8_HANDLER( sound2_w )
 	set_led_status(12,data & 0x20);
 
 	/* bit 7 goes directly to the sound amplifier */
-	DAC_data_w(0,((data & 0x80) >> 7) * 255);
+	dac_data_w(0,((data & 0x80) >> 7) * 255);
 }
 
 static WRITE8_HANDLER( lamps2_w )
diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c
index cb8af5b3e9e..237565d90a4 100644
--- a/src/mame/drivers/ginganin.c
+++ b/src/mame/drivers/ginganin.c
@@ -179,10 +179,10 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0801, 0x0801) AM_WRITE(MC6840_control_port_1_w)	/* Takahiro Nogi. 1999/09/27 */
 	AM_RANGE(0x0802, 0x0802) AM_WRITE(MC6840_write_port_0_w)		/* Takahiro Nogi. 1999/09/27 */
 	AM_RANGE(0x0803, 0x0803) AM_WRITE(MC6840_write_port_1_w)		/* Takahiro Nogi. 1999/09/27 */
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(Y8950_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(Y8950_write_port_0_w)
-	AM_RANGE(0x2800, 0x2800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2801, 0x2801) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(y8950_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(y8950_write_port_0_w)
+	AM_RANGE(0x2800, 0x2800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2801, 0x2801) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/gladiatr.c b/src/mame/drivers/gladiatr.c
index ecd021e46f6..341084dcfd6 100644
--- a/src/mame/drivers/gladiatr.c
+++ b/src/mame/drivers/gladiatr.c
@@ -414,8 +414,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ppking_cpu2_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2203_read_port_0_r) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2203_status_port_0_r) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2203_read_port_0_r) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x20, 0x21) AM_READ(qx1_r) AM_WRITE(qx1_w)
 	AM_RANGE(0x40, 0x40) AM_READ(SMH_NOP)
 	AM_RANGE(0x60, 0x61) AM_READ(qx2_r) AM_WRITE(qx2_w)
@@ -462,8 +462,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gladiatr_cpu2_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x20, 0x21) AM_READWRITE(TAITO8741_1_r, TAITO8741_1_w)
 	AM_RANGE(0x40, 0x40) AM_NOP	// WRITE(sub_irq_ack_w)
 	AM_RANGE(0x60, 0x61) AM_READWRITE(TAITO8741_2_r, TAITO8741_2_w)
diff --git a/src/mame/drivers/gng.c b/src/mame/drivers/gng.c
index d532478012d..9bcdaddfb26 100644
--- a/src/mame/drivers/gng.c
+++ b/src/mame/drivers/gng.c
@@ -105,10 +105,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/goal92.c b/src/mame/drivers/goal92.c
index 5398e7307fe..f0c9387b4a6 100644
--- a/src/mame/drivers/goal92.c
+++ b/src/mame/drivers/goal92.c
@@ -106,10 +106,10 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(adpcm_control_w)
 	AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w)
-	AM_RANGE(0xe800, 0xe800) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xe801, 0xe801) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0xec01, 0xec01) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0xe800, 0xe800) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xe801, 0xe801) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0xec01, 0xec01) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/goindol.c b/src/mame/drivers/goindol.c
index 25a04a39b79..a98730cc75f 100644
--- a/src/mame/drivers/goindol.c
+++ b/src/mame/drivers/goindol.c
@@ -138,8 +138,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 #define GOINDOL_INPUT_BITS \
diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c
index 7411ddd15ce..4a9cc723fa2 100644
--- a/src/mame/drivers/goldstar.c
+++ b/src/mame/drivers/goldstar.c
@@ -76,8 +76,8 @@ static ADDRESS_MAP_START( map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xf810, 0xf810) AM_READ(input_port_3_r)
 	AM_RANGE(0xf811, 0xf811) AM_READ(input_port_4_r)
 	AM_RANGE(0xf820, 0xf820) AM_READ(input_port_5_r)	/* DSW 2 */
-	AM_RANGE(0xf830, 0xf830) AM_READWRITE(AY8910_read_port_0_r,AY8910_write_port_0_w)
-	AM_RANGE(0xf840, 0xf840) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xf830, 0xf830) AM_READWRITE(ay8910_read_port_0_r,ay8910_write_port_0_w)
+	AM_RANGE(0xf840, 0xf840) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xfa00, 0xfa00) AM_WRITE(goldstar_fa00_w)
 	AM_RANGE(0xfb00, 0xfb00) AM_READWRITE(okim6295_status_0_r,okim6295_data_0_w)
 	AM_RANGE(0xfd00, 0xfdff) AM_READWRITE(SMH_RAM,paletteram_BBGGGRRR_w) AM_BASE(&paletteram)
diff --git a/src/mame/drivers/gotcha.c b/src/mame/drivers/gotcha.c
index 9d1065a094d..b1ad1ac0962 100644
--- a/src/mame/drivers/gotcha.c
+++ b/src/mame/drivers/gotcha.c
@@ -133,15 +133,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xc006, 0xc006) AM_READ(soundlatch_r)
 	AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xc002, 0xc003) AM_WRITE(okim6295_data_0_w)	// TWO addresses!
 	AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/gradius3.c b/src/mame/drivers/gradius3.c
index 936d3abe95c..92578c18719 100644
--- a/src/mame/drivers/gradius3.c
+++ b/src/mame/drivers/gradius3.c
@@ -208,8 +208,8 @@ static ADDRESS_MAP_START( gradius3_s_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(sound_bank_w)				/* 007232 bankswitch */
 	AM_RANGE(0xf010, 0xf010) AM_READ(soundlatch_r)
 	AM_RANGE(0xf020, 0xf02d) AM_READWRITE(k007232_read_port_0_r, k007232_write_port_0_w)
-	AM_RANGE(0xf030, 0xf030) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf031, 0xf031) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf030, 0xf030) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf031, 0xf031) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xf800, 0xffff) AM_RAM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/grchamp.c b/src/mame/drivers/grchamp.c
index ab868fc2f83..e4f00229d34 100644
--- a/src/mame/drivers/grchamp.c
+++ b/src/mame/drivers/grchamp.c
@@ -564,12 +564,12 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x4000, 0x43ff) AM_RAM
-	AM_RANGE(0x4800, 0x4800) AM_MIRROR(0x07f8) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4801, 0x4801) AM_MIRROR(0x07f8) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x4802, 0x4802) AM_MIRROR(0x07f8) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4803, 0x4803) AM_MIRROR(0x07f8) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x4804, 0x4804) AM_MIRROR(0x07fa) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x4805, 0x4805) AM_MIRROR(0x07fa) AM_READWRITE(AY8910_read_port_2_r, AY8910_write_port_2_w)
+	AM_RANGE(0x4800, 0x4800) AM_MIRROR(0x07f8) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4801, 0x4801) AM_MIRROR(0x07f8) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x4802, 0x4802) AM_MIRROR(0x07f8) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4803, 0x4803) AM_MIRROR(0x07f8) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x4804, 0x4804) AM_MIRROR(0x07fa) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x4805, 0x4805) AM_MIRROR(0x07fa) AM_READWRITE(ay8910_read_port_2_r, ay8910_write_port_2_w)
 	AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index 5e27275bd22..baea365538b 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -328,17 +328,17 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x02, 0x02) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x02, 0x02) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(gs_sh_bankswitch_w)
 	AM_RANGE(0x08, 0x08) AM_WRITE(gs_sh_pending_command_clear_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/gsword.c b/src/mame/drivers/gsword.c
index cf26f9ef01c..0046f68b029 100644
--- a/src/mame/drivers/gsword.c
+++ b/src/mame/drivers/gsword.c
@@ -331,12 +331,12 @@ static WRITE8_HANDLER( josvolly_nmi_enable_w )
 
 static WRITE8_HANDLER( gsword_AY8910_control_port_0_w )
 {
-	AY8910_control_port_0_w(machine,offset,data);
+	ay8910_control_port_0_w(machine,offset,data);
 	fake8910_0 = data;
 }
 static WRITE8_HANDLER( gsword_AY8910_control_port_1_w )
 {
-	AY8910_control_port_1_w(machine,offset,data);
+	ay8910_control_port_1_w(machine,offset,data);
 	fake8910_1 = data;
 }
 
@@ -399,9 +399,9 @@ static ADDRESS_MAP_START( cpu2_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x21) AM_WRITE(TAITO8741_3_w) AM_READ(TAITO8741_3_r)
 	AM_RANGE(0x40, 0x41) AM_WRITE(TAITO8741_1_w) AM_READ(TAITO8741_1_r)
 	AM_RANGE(0x60, 0x60) AM_WRITE(gsword_AY8910_control_port_0_w) AM_READ(gsword_fake_0_r)
-	AM_RANGE(0x61, 0x61) AM_WRITE(AY8910_write_port_0_w)          AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ay8910_write_port_0_w)          AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x80, 0x80) AM_WRITE(gsword_AY8910_control_port_1_w) AM_READ(gsword_fake_1_r)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_write_port_1_w)          AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_write_port_1_w)          AM_READ(ay8910_read_port_1_r)
 //
 	AM_RANGE(0xe0, 0xe0) AM_READ(SMH_NOP) /* ?? */
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(SMH_NOP) /* ?? */
@@ -433,9 +433,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( josvolly_cpu2_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(gsword_AY8910_control_port_0_w) AM_READ(gsword_fake_0_r)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)          AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)          AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x40, 0x40) AM_WRITE(gsword_AY8910_control_port_1_w) AM_READ(gsword_fake_1_r)
-	AM_RANGE(0x41, 0x41) AM_WRITE(AY8910_write_port_1_w)          AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_write_port_1_w)          AM_READ(ay8910_read_port_1_r)
 
 	AM_RANGE(0x81, 0x81) AM_WRITE(josvolly_nmi_enable_w)
 	AM_RANGE(0xC1, 0xC1) AM_NOP // irq clear
diff --git a/src/mame/drivers/gundealr.c b/src/mame/drivers/gundealr.c
index d0fddfb98e5..c62ee2126cb 100644
--- a/src/mame/drivers/gundealr.c
+++ b/src/mame/drivers/gundealr.c
@@ -175,8 +175,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/gunsmoke.c b/src/mame/drivers/gunsmoke.c
index 557eb487433..e98c9310a5a 100644
--- a/src/mame/drivers/gunsmoke.c
+++ b/src/mame/drivers/gunsmoke.c
@@ -133,10 +133,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 /* Input Ports */
diff --git a/src/mame/drivers/gyruss.c b/src/mame/drivers/gyruss.c
index 1378766b1a2..b09cf681eaa 100644
--- a/src/mame/drivers/gyruss.c
+++ b/src/mame/drivers/gyruss.c
@@ -176,21 +176,21 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( audio_cpu1_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_1_w)
-  	AM_RANGE(0x05, 0x05) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x09, 0x09) AM_READ(AY8910_read_port_2_r)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0x0c, 0x0c) AM_WRITE(AY8910_control_port_3_w)
-  	AM_RANGE(0x0d, 0x0d) AM_READ(AY8910_read_port_3_r)
-	AM_RANGE(0x0e, 0x0e) AM_WRITE(AY8910_write_port_3_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_4_w)
-  	AM_RANGE(0x11, 0x11) AM_READ(AY8910_read_port_4_r)
-	AM_RANGE(0x12, 0x12) AM_WRITE(AY8910_write_port_4_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_1_w)
+  	AM_RANGE(0x05, 0x05) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x09, 0x09) AM_READ(ay8910_read_port_2_r)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0x0c, 0x0c) AM_WRITE(ay8910_control_port_3_w)
+  	AM_RANGE(0x0d, 0x0d) AM_READ(ay8910_read_port_3_r)
+	AM_RANGE(0x0e, 0x0e) AM_WRITE(ay8910_write_port_3_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_4_w)
+  	AM_RANGE(0x11, 0x11) AM_READ(ay8910_read_port_4_r)
+	AM_RANGE(0x12, 0x12) AM_WRITE(ay8910_write_port_4_w)
 	AM_RANGE(0x14, 0x14) AM_WRITE(gyruss_i8039_irq_w)
 	AM_RANGE(0x18, 0x18) AM_WRITE(soundlatch2_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/hal21.c b/src/mame/drivers/hal21.c
index 6007dd25c92..9abbcb29362 100644
--- a/src/mame/drivers/hal21.c
+++ b/src/mame/drivers/hal21.c
@@ -589,8 +589,8 @@ static ADDRESS_MAP_START( aso_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xd000, 0xd000) AM_READ(hal21_soundcommand_r)
 	AM_RANGE(0xe000, 0xe000) AM_READ(CPUC_ready_r)
-	AM_RANGE(0xf000, 0xf000) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w) /* YM3526 #1 control port? */
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM3526_write_port_0_w)   /* YM3526 #1 write port?  */
+	AM_RANGE(0xf000, 0xf000) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w) /* YM3526 #1 control port? */
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym3526_write_port_0_w)   /* YM3526 #1 write port?  */
 	AM_RANGE(0xf002, 0xf002) AM_READNOP // unknown read
 	AM_RANGE(0xf004, 0xf004) AM_READNOP // unknown read
 	AM_RANGE(0xf006, 0xf006) AM_READNOP // unknown read
@@ -603,11 +603,11 @@ static ADDRESS_MAP_START( hal21_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(hal21_soundcommand_r)
 	AM_RANGE(0xc000, 0xc000) AM_READ(CPUC_ready_r)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe002, 0xe002) AM_WRITE(hal21_soundack_w) // bitfielded(0-5) acknowledge write, details unknown
-	AM_RANGE(0xe008, 0xe008) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xe009, 0xe009) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xe008, 0xe008) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xe009, 0xe009) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hal21_sound_portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 95f3cee3183..a918cdb00b6 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1655,9 +1655,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x4801, 0x4801) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0x4803, 0x4803) AM_READ(AY8910_read_port_2_r)
-	AM_RANGE(0x4805, 0x4805) AM_READ(AY8910_read_port_3_r)
+	AM_RANGE(0x4801, 0x4801) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0x4803, 0x4803) AM_READ(ay8910_read_port_2_r)
+	AM_RANGE(0x4805, 0x4805) AM_READ(ay8910_read_port_3_r)
 	AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r)
 	AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM) // space for diagnostic ROM
 ADDRESS_MAP_END
@@ -1666,12 +1666,12 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x4800, 0x4800) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4801, 0x4801) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x4802, 0x4802) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x4803, 0x4803) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0x4804, 0x4804) AM_WRITE(AY8910_control_port_3_w)
-	AM_RANGE(0x4805, 0x4805) AM_WRITE(AY8910_write_port_3_w)
+	AM_RANGE(0x4800, 0x4800) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4801, 0x4801) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x4802, 0x4802) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x4803, 0x4803) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0x4804, 0x4804) AM_WRITE(ay8910_control_port_3_w)
+	AM_RANGE(0x4805, 0x4805) AM_WRITE(ay8910_write_port_3_w)
 	AM_RANGE(0xe000, 0xefff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/hanaawas.c b/src/mame/drivers/hanaawas.c
index 7d6903ea86d..92d26f62324 100644
--- a/src/mame/drivers/hanaawas.c
+++ b/src/mame/drivers/hanaawas.c
@@ -97,14 +97,14 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_READ(hanaawas_input_port_0_r)
 	AM_RANGE(0x01, 0x01) AM_READNOP /* it must return 0 */
-	AM_RANGE(0x10, 0x10) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x10, 0x10) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(hanaawas_inputs_mux_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x11, 0x11) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x11, 0x11) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/hanaroku.c b/src/mame/drivers/hanaroku.c
index fa6245d8b70..f0a2a3d2144 100644
--- a/src/mame/drivers/hanaroku.c
+++ b/src/mame/drivers/hanaroku.c
@@ -124,7 +124,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xa000, 0xa1ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xc000, 0xc3ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xc400, 0xc4ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xd000, 0xd000) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xd000, 0xd000) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0xe000, 0xe000) AM_READ(input_port_0_r)
 	AM_RANGE(0xe001, 0xe001) AM_READ(input_port_1_r)
 	AM_RANGE(0xe002, 0xe002) AM_READ(input_port_2_r)
@@ -141,8 +141,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xc3ff) AM_WRITE(SMH_RAM)				// main ram
 	AM_RANGE(0xc400, 0xc4ff) AM_WRITE(SMH_RAM)	// ???
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP)	// ??? always 0x40
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(hanaroku_out_0_w)
 	AM_RANGE(0xe002, 0xe002) AM_WRITE(hanaroku_out_1_w)
 	AM_RANGE(0xe004, 0xe004) AM_WRITE(hanaroku_out_2_w)
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index f42f5adc358..30fc14b02f6 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -96,7 +96,7 @@ static WRITE8_HANDLER( sound_bank_w )
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)
 	AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -108,8 +108,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9880, 0x9889) AM_WRITE(k051649_frequency_w)
 	AM_RANGE(0x988a, 0x988e) AM_WRITE(k051649_volume_w)
 	AM_RANGE(0x988f, 0x988f) AM_WRITE(k051649_keyonoff_w)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(sound_bank_w) /* 7232 bankswitch */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/hexa.c b/src/mame/drivers/hexa.c
index fc37ba8ce27..989adf29ecd 100644
--- a/src/mame/drivers/hexa.c
+++ b/src/mame/drivers/hexa.c
@@ -62,15 +62,15 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1)
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xd001, 0xd001) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xd001, 0xd001) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xd008, 0xd008) AM_WRITE(hexa_d008_w)
 	AM_RANGE(0xd010, 0xd010) AM_WRITE(watchdog_reset_w)	/* or IRQ acknowledge, or both */
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(hexa_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
diff --git a/src/mame/drivers/higemaru.c b/src/mame/drivers/higemaru.c
index 2b34187622d..0e1aaec3920 100644
--- a/src/mame/drivers/higemaru.c
+++ b/src/mame/drivers/higemaru.c
@@ -43,10 +43,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc800, 0xc800) AM_WRITE(higemaru_c800_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc802, 0xc802) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xc803, 0xc803) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xc804, 0xc804) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc802, 0xc802) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xc803, 0xc803) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xc804, 0xc804) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xd000, 0xd3ff) AM_WRITE(higemaru_videoram_w) AM_BASE(&videoram)
 	AM_RANGE(0xd400, 0xd7ff) AM_WRITE(higemaru_colorram_w) AM_BASE(&colorram)
 	AM_RANGE(0xd880, 0xd9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c
index 9023b00a7bc..56ff7b96583 100644
--- a/src/mame/drivers/hnayayoi.c
+++ b/src/mame/drivers/hnayayoi.c
@@ -117,8 +117,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hnayayoi_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x03, 0x03) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x03, 0x03) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0x04, 0x04) AM_READ_PORT("DSW3")
 	AM_RANGE(0x41, 0x41) AM_READ(keyboard_0_r)
 	AM_RANGE(0x42, 0x42) AM_READ(keyboard_1_r)
@@ -127,8 +127,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hnayayoi_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x06, 0x06) AM_WRITE(adpcm_data_w)
 //  AM_RANGE(0x08, 0x08) AM_WRITE(SMH_NOP) // CRT Controller
 //  AM_RANGE(0x09, 0x09) AM_WRITE(SMH_NOP) // CRT Controller
@@ -146,8 +146,8 @@ static ADDRESS_MAP_START( hnfubuki_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x77ff) AM_READ(SMH_ROM)
 	AM_RANGE(0x7800, 0x7fff) AM_READ(SMH_RAM)
 	AM_RANGE(0x8000, 0xfeff) AM_READ(SMH_ROM)
-	AM_RANGE(0xff02, 0xff02) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xff03, 0xff03) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xff02, 0xff02) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xff03, 0xff03) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0xff04, 0xff04) AM_READ_PORT("DSW3")
 	AM_RANGE(0xff41, 0xff41) AM_READ(keyboard_0_r)
 	AM_RANGE(0xff42, 0xff42) AM_READ(keyboard_1_r)
@@ -158,8 +158,8 @@ static ADDRESS_MAP_START( hnfubuki_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x77ff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x7800, 0x7fff) AM_WRITE(SMH_RAM) AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x8000, 0xfeff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xff00, 0xff00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xff01, 0xff01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xff00, 0xff00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xff01, 0xff01) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xff06, 0xff06) AM_WRITE(adpcm_data_w)
 //  AM_RANGE(0xff08, 0xff08) AM_WRITE(SMH_NOP) // CRT Controller
 //  AM_RANGE(0xff09, 0xff09) AM_WRITE(SMH_NOP) // CRT Controller
@@ -197,8 +197,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( untoucha_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x11, 0x11) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x51, 0x51) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x11, 0x11) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x51, 0x51) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0x16, 0x16) AM_READ(keyboard_0_r)	// bit 7 = blitter busy flag
 	AM_RANGE(0x15, 0x15) AM_READ(keyboard_1_r)
 	AM_RANGE(0x14, 0x14) AM_READ_PORT("COIN")
@@ -206,8 +206,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( untoucha_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x50, 0x50) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x50, 0x50) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x13, 0x13) AM_WRITE(adpcm_data_w)
 //  AM_RANGE(0x12, 0x12) AM_WRITE(SMH_NOP) // CRT Controller
 //  AM_RANGE(0x52, 0x52) AM_WRITE(SMH_NOP) // CRT Controller
diff --git a/src/mame/drivers/holeland.c b/src/mame/drivers/holeland.c
index 67e0c243c74..528e5ab4508 100644
--- a/src/mame/drivers/holeland.c
+++ b/src/mame/drivers/holeland.c
@@ -63,16 +63,16 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x01, 0x01) AM_READ(watchdog_reset_r)	/* ? */
-	AM_RANGE(0x04, 0x04) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x04, 0x04) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x06, 0x06) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c
index 79ecea8bb3c..437d4e89714 100644
--- a/src/mame/drivers/homedata.c
+++ b/src/mame/drivers/homedata.c
@@ -316,7 +316,7 @@ static WRITE8_HANDLER( mrokumei_sound_io_w )
 	switch (offset & 0xff)
 	{
 		case 0x40:
-			DAC_signed_data_w(0,data);
+			dac_signed_data_w(0,data);
 			break;
 		default:
 			logerror("%04x: I/O write to port %04x\n",activecpu_get_pc(),offset);
@@ -373,17 +373,17 @@ static WRITE8_HANDLER( reikaids_upd7807_portc_w )
 	if (BIT(upd7807_portc,5) && !BIT(data,5))	/* write clock 1->0 */
 	{
 		if (BIT(data,3))
-			YM2203_write_port_0_w(machine,0,upd7807_porta);
+			ym2203_write_port_0_w(machine,0,upd7807_porta);
 		else
-			YM2203_control_port_0_w(machine,0,upd7807_porta);
+			ym2203_control_port_0_w(machine,0,upd7807_porta);
 	}
 
 	if (BIT(upd7807_portc,4) && !BIT(data,4))	/* read clock 1->0 */
 	{
 		if (BIT(data,3))
-			upd7807_porta = YM2203_read_port_0_r(machine,0);
+			upd7807_porta = ym2203_read_port_0_r(machine,0);
 		else
-			upd7807_porta = YM2203_status_port_0_r(machine,0);
+			upd7807_porta = ym2203_status_port_0_r(machine,0);
 	}
 
 	upd7807_portc = data;
@@ -660,7 +660,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( reikaids_upd7807_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_WRITE(reikaids_upd7807_porta_w)
-	AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_WRITE(DAC_0_signed_data_w)
+	AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_WRITE(dac_0_signed_data_w)
 	AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_WRITE(reikaids_upd7807_portc_w)
 ADDRESS_MAP_END
 
@@ -714,7 +714,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pteacher_upd7807_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(UPD7807_PORTA, UPD7807_PORTA) AM_WRITE(pteacher_upd7807_porta_w)
-	AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_WRITE(DAC_0_signed_data_w)
+	AM_RANGE(UPD7807_PORTB, UPD7807_PORTB) AM_WRITE(dac_0_signed_data_w)
 	AM_RANGE(UPD7807_PORTC, UPD7807_PORTC) AM_WRITE(pteacher_upd7807_portc_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/homerun.c b/src/mame/drivers/homerun.c
index 1bb9ac24630..c7b3be9f7f1 100644
--- a/src/mame/drivers/homerun.c
+++ b/src/mame/drivers/homerun.c
@@ -103,8 +103,8 @@ static ADDRESS_MAP_START( homerun_iomap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x40) AM_READ(homerun_40_r)
 	AM_RANGE(0x50, 0x50) AM_READ_PORT("IN2")
 	AM_RANGE(0x60, 0x60) AM_READ_PORT("IN1")
-	AM_RANGE(0x70, 0x70) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x71, 0x71) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x70, 0x70) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x71, 0x71) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 static const ym2203_interface ym2203_config =
diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c
index 06ae120a083..ce24a887e71 100644
--- a/src/mame/drivers/hotblock.c
+++ b/src/mame/drivers/hotblock.c
@@ -108,8 +108,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( hotblock_io, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_WRITE(hotblock_port0_w)
 	AM_RANGE(0x0004, 0x0004) AM_READ(hotblock_port4_r) AM_WRITE(hotblock_port4_w)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READ( AY8910_read_port_0_r ) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READ( ay8910_read_port_0_r ) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/hyhoo.c b/src/mame/drivers/hyhoo.c
index eccc11d3b6b..3bfce615963 100644
--- a/src/mame/drivers/hyhoo.c
+++ b/src/mame/drivers/hyhoo.c
@@ -29,9 +29,9 @@ Memo:
 
 #define	SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
+#define DAC_0_WRITE	dac_0_data_w
 #endif
 
 
@@ -68,7 +68,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_hyhoo, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -81,8 +81,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport_hyhoo, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 //  AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(hyhoo_blitter_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c
index 03b9337a447..48af4d0623b 100644
--- a/src/mame/drivers/hyperspt.c
+++ b/src/mame/drivers/hyperspt.c
@@ -122,9 +122,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x4fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(VLM5030_data_w) /* speech data */
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(vlm5030_data_w) /* speech data */
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(hyperspt_sound_w)	  /* speech and output control */
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w)  /* Loads the snd command into the snd latch */
 	AM_RANGE(0xe002, 0xe002) AM_WRITE(konami_SN76496_0_w) 	 /* This address triggers the SN chip to read the data port. */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c
index f1c48e9224e..c1eec35377b 100644
--- a/src/mame/drivers/hyprduel.c
+++ b/src/mame/drivers/hyprduel.c
@@ -509,7 +509,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( hyprduel_readmem2, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x003fff) AM_READ(SMH_RAM						)
 	AM_RANGE(0x004000, 0x007fff) AM_READ(SMH_RAM						)
-	AM_RANGE(0x400002, 0x400003) AM_READ(YM2151_status_port_0_lsb_r	)
+	AM_RANGE(0x400002, 0x400003) AM_READ(ym2151_status_port_0_lsb_r	)
 	AM_RANGE(0x400004, 0x400005) AM_READ(okim6295_status_0_lsb_r		)
 	AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM						)
 	AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM						)
@@ -518,8 +518,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( hyprduel_writemem2, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x003fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_2	)	// shadow ($c00000 - $c03fff : vector, write ok)
 	AM_RANGE(0x004000, 0x007fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram2_2	)	// shadow ($fe4000 - $fe7fff : read only)
-	AM_RANGE(0x400000, 0x400001) AM_WRITE(YM2151_register_port_0_lsb_w	)
-	AM_RANGE(0x400002, 0x400003) AM_WRITE(YM2151_data_port_0_lsb_w		)
+	AM_RANGE(0x400000, 0x400001) AM_WRITE(ym2151_register_port_0_lsb_w	)
+	AM_RANGE(0x400002, 0x400003) AM_WRITE(ym2151_data_port_0_lsb_w		)
 	AM_RANGE(0x400004, 0x400005) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP						)
 	AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_1	)	// (sound driver)
@@ -577,7 +577,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( magerror_readmem2, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x003fff) AM_READ(SMH_RAM						)
 	AM_RANGE(0x004000, 0x007fff) AM_READ(SMH_RAM						)
-//  AM_RANGE(0x400002, 0x400003) AM_READ(YM2151_status_port_0_lsb_r )
+//  AM_RANGE(0x400002, 0x400003) AM_READ(ym2151_status_port_0_lsb_r )
 	AM_RANGE(0x400004, 0x400005) AM_READ(okim6295_status_0_lsb_r		)
 	AM_RANGE(0xc00000, 0xc07fff) AM_READ(SMH_RAM						)
 	AM_RANGE(0xfe0000, 0xffffff) AM_READ(SMH_RAM						)
@@ -586,8 +586,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( magerror_writemem2, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x003fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_2	)	// shadow ($c00000 - $c03fff : vector, write ok)
 	AM_RANGE(0x004000, 0x007fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram2_2	)	// shadow ($fe4000 - $fe7fff : read only)
-  	AM_RANGE(0x400000, 0x400001) AM_WRITE(YM2413_register_port_0_lsb_w  )
-  	AM_RANGE(0x400002, 0x400003) AM_WRITE(YM2413_data_port_0_lsb_w      )
+  	AM_RANGE(0x400000, 0x400001) AM_WRITE(ym2413_register_port_0_lsb_w  )
+  	AM_RANGE(0x400002, 0x400003) AM_WRITE(ym2413_data_port_0_lsb_w      )
 	AM_RANGE(0x400004, 0x400005) AM_WRITE(okim6295_data_0_lsb_w			)
 	AM_RANGE(0x800000, 0x800001) AM_WRITE(SMH_NOP						)
 	AM_RANGE(0xc00000, 0xc07fff) AM_WRITE(SMH_RAM) AM_BASE(&hypr_sub_sharedram1_1	)	// (sound driver)
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index f012a6817d5..4941b5411b4 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -278,8 +278,8 @@ static ADDRESS_MAP_START( jingbell_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x6492, 0x6492 ) AM_WRITE( jingbell_leds_w )
 	AM_RANGE( 0x64a0, 0x64a0 ) AM_READ_PORT( "BUTTONS2" )
 
-	AM_RANGE( 0x64b0, 0x64b0 ) AM_WRITE( YM2413_register_port_0_w )
-	AM_RANGE( 0x64b1, 0x64b1 ) AM_WRITE( YM2413_data_port_0_w )
+	AM_RANGE( 0x64b0, 0x64b0 ) AM_WRITE( ym2413_register_port_0_w )
+	AM_RANGE( 0x64b1, 0x64b1 ) AM_WRITE( ym2413_data_port_0_w )
 
 	AM_RANGE( 0x64c0, 0x64c0 ) AM_READWRITE( okim6295_status_0_r, okim6295_data_0_w )
 
diff --git a/src/mame/drivers/igs_180.c b/src/mame/drivers/igs_180.c
index 6105ad4204b..e0072e38c2d 100644
--- a/src/mame/drivers/igs_180.c
+++ b/src/mame/drivers/igs_180.c
@@ -500,8 +500,8 @@ static ADDRESS_MAP_START( igs_180_portmap, ADDRESS_SPACE_IO, 8 )
 
 	AM_RANGE( 0xa000, 0xa000 ) AM_READ_PORT( "BUTTONS" )
 
-	AM_RANGE( 0xb000, 0xb000 ) AM_WRITE( YM2413_register_port_0_w )
-	AM_RANGE( 0xb001, 0xb001 ) AM_WRITE( YM2413_data_port_0_w )
+	AM_RANGE( 0xb000, 0xb000 ) AM_WRITE( ym2413_register_port_0_w )
+	AM_RANGE( 0xb001, 0xb001 ) AM_WRITE( ym2413_data_port_0_w )
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/igs_blit.c b/src/mame/drivers/igs_blit.c
index e4223e95ed9..c0b3c1983c2 100644
--- a/src/mame/drivers/igs_blit.c
+++ b/src/mame/drivers/igs_blit.c
@@ -1080,13 +1080,13 @@ static READ16_HANDLER( xymg_magic_r )
 static WRITE16_HANDLER( igs_YM3812_control_port_0_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM3812_control_port_0_w(machine,0,data);
+		ym3812_control_port_0_w(machine,0,data);
 }
 
 static WRITE16_HANDLER( igs_YM3812_write_port_0_w )
 {
 	if (ACCESSING_BITS_0_7)
-		YM3812_write_port_0_w(machine,0,data);
+		ym3812_write_port_0_w(machine,0,data);
 }
 
 static ADDRESS_MAP_START( chindrag, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1119,8 +1119,8 @@ static ADDRESS_MAP_START( chmplst2, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE( 0x000000, 0x07ffff ) AM_ROM
 	AM_RANGE( 0x100000, 0x103fff ) AM_RAM AM_BASE( &generic_nvram16 ) AM_SIZE( &generic_nvram_size )
 	AM_RANGE( 0x200000, 0x200001 ) AM_READWRITE( okim6295_status_0_lsb_r, okim6295_data_0_lsb_w )
-	AM_RANGE( 0x204000, 0x204001 ) AM_WRITE( YM2413_register_port_0_lsb_w )
-	AM_RANGE( 0x204002, 0x204003 ) AM_WRITE( YM2413_data_port_0_lsb_w )
+	AM_RANGE( 0x204000, 0x204001 ) AM_WRITE( ym2413_register_port_0_lsb_w )
+	AM_RANGE( 0x204002, 0x204003 ) AM_WRITE( ym2413_data_port_0_lsb_w )
 	AM_RANGE( 0x208000, 0x208003 ) AM_WRITE( chmplst2_magic_w )
 	AM_RANGE( 0x208002, 0x208003 ) AM_READ ( chmplst2_magic_r )
 	AM_RANGE( 0x20c000, 0x20cfff ) AM_RAM AM_BASE(&igs_priority_ram)
diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c
index d01d4664190..549b87f1142 100644
--- a/src/mame/drivers/imolagp.c
+++ b/src/mame/drivers/imolagp.c
@@ -327,10 +327,10 @@ static ADDRESS_MAP_START( imolagp_master, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2802, 0x2802) AM_READ(steerlatch_r) AM_WRITE(SMH_NOP)
 	/*  AM_RANGE(0x2803, 0x2803) ? */
 	AM_RANGE(0x3000, 0x3000) AM_WRITE(vreg_control_w)
-	AM_RANGE(0x37f0, 0x37f0) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x37f0, 0x37f0) AM_WRITE(ay8910_control_port_0_w)
 	/*  AM_RANGE(0x37f7, 0x37f7) ? */
 	AM_RANGE(0x3800, 0x3800) AM_WRITE(vreg_data_w)
-	AM_RANGE(0x3810, 0x3810) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x3810, 0x3810) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x4000, 0x4000) AM_READ_PORT("DSWA")	/* DSWA */
 	AM_RANGE(0x5000, 0x50ff) AM_WRITE(imola_ledram_w)
 	AM_RANGE(0x47ff, 0x4800) AM_WRITE(transmit_data_w)
diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c
index 47cbcb4a166..9011780f32b 100644
--- a/src/mame/drivers/inufuku.c
+++ b/src/mame/drivers/inufuku.c
@@ -246,19 +246,19 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( inufuku_readport_sound, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
-	AM_RANGE(0x08, 0x08) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x09, 0x09) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0x0a, 0x0a) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x08, 0x08) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x09, 0x09) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0x0a, 0x0a) AM_READ(ym2610_status_port_0_b_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( inufuku_writeport_sound, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(inufuku_soundrombank_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(pending_command_clear_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/iqblock.c b/src/mame/drivers/iqblock.c
index 301a828b9cf..a2c19073781 100644
--- a/src/mame/drivers/iqblock.c
+++ b/src/mame/drivers/iqblock.c
@@ -132,8 +132,8 @@ static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x5080, 0x5083) AM_DEVREAD(PPI8255, "ppi8255", ppi8255_r)
 	AM_RANGE(0x5090, 0x5090) AM_READ(input_port_3_r)
 	AM_RANGE(0x50a0, 0x50a0) AM_READ(input_port_4_r)
-	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(YM2413_register_port_0_w) // UM3567_register_port_0_w
-	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(YM2413_data_port_0_w) // UM3567_data_port_0_w
+	AM_RANGE(0x50b0, 0x50b0) AM_WRITE(ym2413_register_port_0_w) // UM3567_register_port_0_w
+	AM_RANGE(0x50b1, 0x50b1) AM_WRITE(ym2413_data_port_0_w) // UM3567_data_port_0_w
 	AM_RANGE(0x50c0, 0x50c0) AM_WRITE(iqblock_irqack_w)
 	AM_RANGE(0x7000, 0x7fff) AM_READ(iqblock_bgvideoram_r)
 	AM_RANGE(0x8000, 0xffff) AM_READ(extrarom_r)
diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c
index 94ed14a388b..cb1ffcbab73 100644
--- a/src/mame/drivers/ironhors.c
+++ b/src/mame/drivers/ironhors.c
@@ -91,16 +91,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( slave_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( farwest_slave_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x43ff) AM_RAM
-	AM_RANGE(0x8000, 0x8000) AM_READWRITE(soundlatch_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_READWRITE(soundlatch_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 8d95c9f1316..e5f75035de3 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -967,8 +967,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_WRITE(sound_return_w)
 	AM_RANGE(0x0400, 0x0400) AM_READ(sound_data_r)
-	AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_READWRITE(ES5506_data_0_r, ES5506_data_0_w)
-	AM_RANGE(0x0880, 0x08bf) AM_READ(ES5506_data_0_r)
+	AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_READWRITE(es5506_data_0_r, es5506_data_0_w)
+	AM_RANGE(0x0880, 0x08bf) AM_READ(es5506_data_0_r)
 	AM_RANGE(0x0c00, 0x0c00) AM_WRITE(sound_bank_w)
 	AM_RANGE(0x1000, 0x1000) AM_WRITENOP	/* noisy */
 	AM_RANGE(0x1400, 0x140f) AM_READWRITE(via_0_r, via_0_w)
@@ -981,7 +981,7 @@ ADDRESS_MAP_END
 /*------ Rev 2 sound board memory layout ------*/
 static ADDRESS_MAP_START( sound_020_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x400) AM_READ(sound_data_r)
-	AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_READWRITE(ES5506_data_0_r, ES5506_data_0_w)
+	AM_RANGE(0x0800, 0x083f) AM_MIRROR(0x80) AM_READWRITE(es5506_data_0_r, es5506_data_0_w)
 	AM_RANGE(0x0c00, 0x0c00) AM_WRITE(sound_bank_w)
 	AM_RANGE(0x1400, 0x1400) AM_WRITE(firq_clear_w)
 	AM_RANGE(0x1800, 0x1800) AM_READWRITE(sound_data_buffer_r, SMH_NOP)
diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c
index b24d1a10922..761dcabaca5 100644
--- a/src/mame/drivers/itech8.c
+++ b/src/mame/drivers/itech8.c
@@ -952,8 +952,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound2203_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_WRITENOP
 	AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
-	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0002) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x0002) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0002) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x0002) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x3000, 0x37ff) AM_RAM
 	AM_RANGE(0x4000, 0x4000) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_ROM
@@ -964,8 +964,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound3812_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_WRITENOP
 	AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
-	AM_RANGE(0x2000, 0x2000) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x3000, 0x37ff) AM_RAM
 	AM_RANGE(0x4000, 0x4000) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x5000, 0x5003) AM_READWRITE(pia_0_r, pia_0_w)
@@ -977,8 +977,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound3812_external_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0000) AM_WRITENOP
 	AM_RANGE(0x1000, 0x1000) AM_READ(sound_data_r)
-	AM_RANGE(0x2000, 0x2000) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x3000, 0x37ff) AM_RAM
 	AM_RANGE(0x4000, 0x4000) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x5000, 0x500f) AM_READWRITE(via_0_r, via_0_w)
diff --git a/src/mame/drivers/jack.c b/src/mame/drivers/jack.c
index 159370e8922..c9087e77486 100644
--- a/src/mame/drivers/jack.c
+++ b/src/mame/drivers/jack.c
@@ -196,13 +196,13 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x40, 0x40) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 #define COMMON_REMAINDER1\
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index f9e0d388140..e9e53ded8ea 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -118,8 +118,8 @@ static ADDRESS_MAP_START( master_map, ADDRESS_SPACE_PROGRAM, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( slave_map, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x4000, 0x43ff) AM_RAM_WRITE(SMH_RAM) AM_BASE(&paletteram)	// self test only checks 0x4000-0x423f, 007327 should actually go up to 4fff
 	AM_RANGE(0x6000, 0x605f) AM_RAM																	// SOUND RAM (Self test check 0x6000-605f, 0x7c00-0x7fff)
 	AM_RANGE(0x6060, 0x7fff) AM_RAM AM_SHARE(1)
diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c
index 605ec4a6269..cdc3b3a1066 100644
--- a/src/mame/drivers/jailbrek.c
+++ b/src/mame/drivers/jailbrek.c
@@ -62,13 +62,13 @@ static INTERRUPT_GEN( jb_interrupt_nmi )
 
 
 static READ8_HANDLER( jailbrek_speech_r ) {
-	return ( VLM5030_BSY() ? 1 : 0 );
+	return ( vlm5030_bsy() ? 1 : 0 );
 }
 
 static WRITE8_HANDLER( jailbrek_speech_w ) {
 	/* bit 0 could be latch direction like in yiear */
-	VLM5030_ST( ( data >> 1 ) & 1 );
-	VLM5030_RST( ( data >> 2 ) & 1 );
+	vlm5030_st( ( data >> 1 ) & 1 );
+	vlm5030_rst( ( data >> 2 ) & 1 );
 }
 
 static ADDRESS_MAP_START( jailbrek_map, ADDRESS_SPACE_PROGRAM, 8 )
@@ -91,7 +91,7 @@ static ADDRESS_MAP_START( jailbrek_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x3302, 0x3302) AM_READ(input_port_2_r) /* joy2 */
 	AM_RANGE(0x3303, 0x3303) AM_READ(input_port_3_r) /* DSW0 */
 	AM_RANGE(0x4000, 0x4000) AM_WRITE(jailbrek_speech_w) /* speech pins */
-	AM_RANGE(0x5000, 0x5000) AM_WRITE(VLM5030_data_w) /* speech data */
+	AM_RANGE(0x5000, 0x5000) AM_WRITE(vlm5030_data_w) /* speech data */
 	AM_RANGE(0x6000, 0x6000) AM_READ(jailbrek_speech_r)
 	AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/jchan.c b/src/mame/drivers/jchan.c
index 53a91d11cb5..4aa747d5772 100644
--- a/src/mame/drivers/jchan.c
+++ b/src/mame/drivers/jchan.c
@@ -604,8 +604,8 @@ static ADDRESS_MAP_START( jchan_sub, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x700000, 0x703fff) AM_RAM // AM_BASE(&jchan_spriteram) AM_WRITE(jchan_suprnova_sprite32_w)
 	AM_RANGE(0x780000, 0x78003f) AM_RAM // AM_BASE(&jchan_sprregs) AM_WRITE(jchan_suprnova_sprite32regs_w)
 
-	AM_RANGE(0x800000, 0x800001) AM_WRITE(YMZ280B_register_0_lsb_w) // sound
-	AM_RANGE(0x800002, 0x800003) AM_WRITE(YMZ280B_data_0_lsb_w) 	//
+	AM_RANGE(0x800000, 0x800001) AM_WRITE(ymz280b_register_0_lsb_w) // sound
+	AM_RANGE(0x800002, 0x800003) AM_WRITE(ymz280b_data_0_lsb_w) 	//
 
 	AM_RANGE(0xa00000, 0xa00001) AM_READWRITE(watchdog_reset16_r, watchdog_reset16_w)	// watchdog
 ADDRESS_MAP_END
@@ -735,7 +735,7 @@ INPUT_PORTS_END
 
 /* sound stuff */
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	0	// irq ?
 };
diff --git a/src/mame/drivers/jcross.c b/src/mame/drivers/jcross.c
index 39eb75f7759..29fb70ce012 100644
--- a/src/mame/drivers/jcross.c
+++ b/src/mame/drivers/jcross.c
@@ -85,11 +85,11 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(sound_command_r)
 	AM_RANGE(0xc000, 0xc000) AM_READ(sound_nmi_ack_r)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe002, 0xe007) AM_WRITE(snkwave_w)
-	AM_RANGE(0xe008, 0xe008) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xe009, 0xe009) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xe008, 0xe008) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xe009, 0xe009) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c
index 82d87768767..e2ef2a06a57 100644
--- a/src/mame/drivers/jollyjgr.c
+++ b/src/mame/drivers/jollyjgr.c
@@ -150,8 +150,8 @@ static ADDRESS_MAP_START( jollyjgr_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x8ff8, 0x8ff8) AM_READ(input_port_0_r)
 	AM_RANGE(0x8ff9, 0x8ff9) AM_READ(input_port_1_r)
-	AM_RANGE(0x8ff8, 0x8ff8) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8ffa, 0x8ffa) AM_READWRITE(input_port_2_r, AY8910_write_port_0_w)
+	AM_RANGE(0x8ff8, 0x8ff8) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8ffa, 0x8ffa) AM_READWRITE(input_port_2_r, ay8910_write_port_0_w)
 	AM_RANGE(0x8fff, 0x8fff) AM_READ(input_port_3_r)
 	AM_RANGE(0x8ffc, 0x8ffc) AM_WRITE(jollyjgr_misc_w)
 	AM_RANGE(0x8ffd, 0x8ffd) AM_WRITE(jollyjgr_coin_lookout_w)
diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c
index f21ce0cad4e..3d499dfbb61 100644
--- a/src/mame/drivers/jongkyo.c
+++ b/src/mame/drivers/jongkyo.c
@@ -182,9 +182,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( jongkyo_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	// R 01 keyboard
-	AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
 
 	AM_RANGE(0x10, 0x10) AM_READ_PORT("DSW")
 	AM_RANGE(0x11, 0x11) AM_READ_PORT("IN0") AM_WRITE(keyboard_select_w)
diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c
index 1e28fe45c1c..a8d8c8ad18d 100644
--- a/src/mame/drivers/junofrst.c
+++ b/src/mame/drivers/junofrst.c
@@ -205,9 +205,9 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x2000, 0x23ff) AM_RAM
 	AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x4002, 0x4002) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x4002, 0x4002) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x5000, 0x5000) AM_WRITE(soundlatch2_w)
 	AM_RANGE(0x6000, 0x6000) AM_WRITE(junofrst_i8039_irq_w)
 ADDRESS_MAP_END
@@ -220,7 +220,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mcu_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0xff) AM_READ(soundlatch2_r)
-	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(i8039_irqen_and_status_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c
index c0877b72a6b..21a47eff6bd 100644
--- a/src/mame/drivers/kaneko16.c
+++ b/src/mame/drivers/kaneko16.c
@@ -277,31 +277,31 @@ static WRITE16_HANDLER( kaneko16_soundlatch_w )
 static READ16_HANDLER( kaneko16_YM2149_0_r )
 {
 	/* Each 2149 register is mapped to a different address */
-	AY8910_control_port_0_w(machine,0,offset);
-	return AY8910_read_port_0_r(machine,0);
+	ay8910_control_port_0_w(machine,0,offset);
+	return ay8910_read_port_0_r(machine,0);
 }
 static READ16_HANDLER( kaneko16_YM2149_1_r )
 {
 	/* Each 2149 register is mapped to a different address */
-	AY8910_control_port_1_w(machine,0,offset);
-	return AY8910_read_port_1_r(machine,0);
+	ay8910_control_port_1_w(machine,0,offset);
+	return ay8910_read_port_1_r(machine,0);
 }
 
 static WRITE16_HANDLER( kaneko16_YM2149_0_w )
 {
 	/* Each 2149 register is mapped to a different address */
-	AY8910_control_port_0_w(machine,0,offset);
+	ay8910_control_port_0_w(machine,0,offset);
 	/* The registers are mapped to odd addresses, except one! */
-	if (ACCESSING_BITS_0_7)	AY8910_write_port_0_w(machine,0, data       & 0xff);
-	else				AY8910_write_port_0_w(machine,0,(data >> 8) & 0xff);
+	if (ACCESSING_BITS_0_7)	ay8910_write_port_0_w(machine,0, data       & 0xff);
+	else				ay8910_write_port_0_w(machine,0,(data >> 8) & 0xff);
 }
 static WRITE16_HANDLER( kaneko16_YM2149_1_w )
 {
 	/* Each 2149 register is mapped to a different address */
-	AY8910_control_port_1_w(machine,0,offset);
+	ay8910_control_port_1_w(machine,0,offset);
 	/* The registers are mapped to odd addresses, except one! */
-	if (ACCESSING_BITS_0_7)	AY8910_write_port_1_w(machine,0, data       & 0xff);
-	else				AY8910_write_port_1_w(machine,0,(data >> 8) & 0xff);
+	if (ACCESSING_BITS_0_7)	ay8910_write_port_1_w(machine,0, data       & 0xff);
+	else				ay8910_write_port_1_w(machine,0,(data >> 8) & 0xff);
 }
 
 
@@ -856,8 +856,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( blazeon_soundport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x06, 0x06) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/kangaroo.c b/src/mame/drivers/kangaroo.c
index 792f1ea3ac7..1db5d0b679a 100644
--- a/src/mame/drivers/kangaroo.c
+++ b/src/mame/drivers/kangaroo.c
@@ -274,8 +274,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM
 	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r)
-	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -284,8 +284,8 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_ROM
 	AM_RANGE(0x4000, 0x43ff) AM_MIRROR(0x0c00) AM_RAM
 	AM_RANGE(0x6000, 0x6000) AM_MIRROR(0x0fff) AM_READ(soundlatch_r)
-	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x0fff) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c
index bdc58fb6b7d..fb8c78a3f76 100644
--- a/src/mame/drivers/karnov.c
+++ b/src/mame/drivers/karnov.c
@@ -368,10 +368,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( karnov_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
  	AM_RANGE(0x0000, 0x05ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w) /* OPN */
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x1800, 0x1800) AM_WRITE(YM3526_control_port_0_w) /* OPL */
-	AM_RANGE(0x1801, 0x1801) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym2203_control_port_0_w) /* OPN */
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x1800, 0x1800) AM_WRITE(ym3526_control_port_0_w) /* OPL */
+	AM_RANGE(0x1801, 0x1801) AM_WRITE(ym3526_write_port_0_w)
  	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c
index 6a3cc78ebfc..97baecd244d 100644
--- a/src/mame/drivers/kchamp.c
+++ b/src/mame/drivers/kchamp.c
@@ -162,10 +162,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(sound_msm_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(sound_control_w)
 ADDRESS_MAP_END
@@ -237,11 +237,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( kc_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(kc_sound_control_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/kingobox.c b/src/mame/drivers/kingobox.c
index a670871f68a..bd298459727 100644
--- a/src/mame/drivers/kingobox.c
+++ b/src/mame/drivers/kingobox.c
@@ -155,14 +155,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x08, 0x08) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x08, 0x08) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(DAC_0_data_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0c, 0x0c) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(dac_0_data_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0c, 0x0c) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 /* Ring King */
@@ -231,14 +231,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( rk_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( rk_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(DAC_0_data_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(dac_0_data_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( kingofb )
diff --git a/src/mame/drivers/kncljoe.c b/src/mame/drivers/kncljoe.c
index 3ca84a4a3aa..a10054fcd50 100644
--- a/src/mame/drivers/kncljoe.c
+++ b/src/mame/drivers/kncljoe.c
@@ -86,12 +86,12 @@ static WRITE8_HANDLER( m6803_port2_w )
 		if (port2 & 0x04)
 		{
 			if (port2 & 0x08)
-				AY8910_control_port_0_w(machine, 0, port1);
+				ay8910_control_port_0_w(machine, 0, port1);
 		}
 		else
 		{
 			if (port2 & 0x08)
-				AY8910_write_port_0_w(machine, 0, port1);
+				ay8910_write_port_0_w(machine, 0, port1);
 		}
 	}
 	port2 = data;
@@ -100,7 +100,7 @@ static WRITE8_HANDLER( m6803_port2_w )
 static READ8_HANDLER( m6803_port1_r )
 {
 	if (port2 & 0x08)
-		return AY8910_read_port_0_r(machine, 0);
+		return ay8910_read_port_0_r(machine, 0);
 	return 0xff;
 }
 
diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c
index e9d3bcf4608..356d1c53229 100644
--- a/src/mame/drivers/koikoi.c
+++ b/src/mame/drivers/koikoi.c
@@ -136,9 +136,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x02, 0x02) AM_WRITENOP //unknown , many writes
-	AM_RANGE(0x03, 0x03) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE(0x07, 0x07) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_write_port_0_w)
 
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c
index 0505884a007..fd913c379a0 100644
--- a/src/mame/drivers/ksayakyu.c
+++ b/src/mame/drivers/ksayakyu.c
@@ -125,11 +125,11 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( soundcpu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x83ff) AM_RAM
-	AM_RANGE(0xa001, 0xa001) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa002, 0xa002) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xa003, 0xa003) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa006, 0xa006) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0xa007, 0xa007) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa002, 0xa002) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xa003, 0xa003) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa006, 0xa006) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0xa007, 0xa007) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xa008, 0xa008) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xa00c, 0xa00c) AM_WRITE(tomaincpu_w)
 	AM_RANGE(0xa010, 0xa010) AM_WRITE(SMH_NOP)
diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c
index 833d532e45c..49ede392a17 100644
--- a/src/mame/drivers/kyugo.c
+++ b/src/mame/drivers/kyugo.c
@@ -124,11 +124,11 @@ Sub_MemMap( flashgla, 0x7fff, 0xe000, 0xc040, 0xc080, 0xc0c0 )
 #define Sub_PortMap( name, ay0_base, ay1_base )								\
 static ADDRESS_MAP_START( name##_sub_portmap, ADDRESS_SPACE_IO, 8 )			\
 	ADDRESS_MAP_GLOBAL_MASK(0xff)										\
-	AM_RANGE(ay0_base+0, ay0_base+0) AM_WRITE(AY8910_control_port_0_w)		\
-	AM_RANGE(ay0_base+1, ay0_base+1) AM_WRITE(AY8910_write_port_0_w)		\
-	AM_RANGE(ay0_base+2, ay0_base+2) AM_READ(AY8910_read_port_0_r)			\
-	AM_RANGE(ay1_base+0, ay1_base+0) AM_WRITE(AY8910_control_port_1_w)		\
-	AM_RANGE(ay1_base+1, ay1_base+1) AM_WRITE(AY8910_write_port_1_w)		\
+	AM_RANGE(ay0_base+0, ay0_base+0) AM_WRITE(ay8910_control_port_0_w)		\
+	AM_RANGE(ay0_base+1, ay0_base+1) AM_WRITE(ay8910_write_port_0_w)		\
+	AM_RANGE(ay0_base+2, ay0_base+2) AM_READ(ay8910_read_port_0_r)			\
+	AM_RANGE(ay1_base+0, ay1_base+0) AM_WRITE(ay8910_control_port_1_w)		\
+	AM_RANGE(ay1_base+1, ay1_base+1) AM_WRITE(ay8910_write_port_1_w)		\
 ADDRESS_MAP_END																\
 
 Sub_PortMap( gyrodine, 0x00, 0xc0 )
diff --git a/src/mame/drivers/labyrunr.c b/src/mame/drivers/labyrunr.c
index 33eaeba4db4..24e4b63944a 100644
--- a/src/mame/drivers/labyrunr.c
+++ b/src/mame/drivers/labyrunr.c
@@ -55,10 +55,10 @@ if (data & 0xe0) popmessage("bankswitch %02x",data);
 
 static ADDRESS_MAP_START( labyrunr_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0020, 0x005f) AM_READ(SMH_RAM)	/* scroll registers */
-	AM_RANGE(0x0801, 0x0801) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x0800, 0x0800) AM_READ(YM2203_read_port_0_r)
-	AM_RANGE(0x0901, 0x0901) AM_READ(YM2203_status_port_1_r)
-	AM_RANGE(0x0900, 0x0900) AM_READ(YM2203_read_port_1_r)
+	AM_RANGE(0x0801, 0x0801) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x0800, 0x0800) AM_READ(ym2203_read_port_0_r)
+	AM_RANGE(0x0901, 0x0901) AM_READ(ym2203_status_port_1_r)
+	AM_RANGE(0x0900, 0x0900) AM_READ(ym2203_read_port_1_r)
 	AM_RANGE(0x0a00, 0x0a00) AM_READ(input_port_5_r)
 	AM_RANGE(0x0a01, 0x0a01) AM_READ(input_port_4_r)
 	AM_RANGE(0x0b00, 0x0b00) AM_READ(input_port_3_r)
@@ -73,10 +73,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( labyrunr_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0007) AM_WRITE(K007121_ctrl_0_w)
 	AM_RANGE(0x0020, 0x005f) AM_WRITE(SMH_RAM)	AM_BASE(&labyrunr_scrollram) /* scroll registers */
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x0901, 0x0901) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x0900, 0x0900) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x0901, 0x0901) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x0900, 0x0900) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0x0c00, 0x0c00) AM_WRITE(labyrunr_bankswitch_w)
 	AM_RANGE(0x0d00, 0x0d1f) AM_WRITE(K051733_w)				/* 051733 (protection) */
 	AM_RANGE(0x0e00, 0x0e00) AM_WRITE(watchdog_reset_w)
diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c
index 83121df5eb3..f0ebf2c022a 100644
--- a/src/mame/drivers/ladyfrog.c
+++ b/src/mame/drivers/ladyfrog.c
@@ -188,8 +188,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xc800, 0xc801) AM_WRITE(SMH_NOP)
-	AM_RANGE(0xc802, 0xc802) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc803, 0xc803) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc802, 0xc802) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc803, 0xc803) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xc900, 0xc90d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0xca00, 0xca00) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xcb00, 0xcb00) AM_WRITE(SMH_NOP)
diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c
index 31fa0fb37b9..ea1ba4e0703 100644
--- a/src/mame/drivers/laserbat.c
+++ b/src/mame/drivers/laserbat.c
@@ -602,9 +602,9 @@ static int active_8910,port0a;
 static READ8_HANDLER( zaccaria_port0a_r )
 {
 	if (active_8910 == 0)
-		return AY8910_read_port_0_r(machine,0);
+		return ay8910_read_port_0_r(machine,0);
 	else
-		return AY8910_read_port_1_r(machine,0);
+		return ay8910_read_port_1_r(machine,0);
 }
 
 static WRITE8_HANDLER( zaccaria_port0a_w )
@@ -622,9 +622,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
 	{
 		/* bit 0 goes to the 8910 #0 BC1 pin */
 		if (last & 0x01)
-			AY8910_control_port_0_w(machine,0,port0a);
+			ay8910_control_port_0_w(machine,0,port0a);
 		else
-			AY8910_write_port_0_w(machine,0,port0a);
+			ay8910_write_port_0_w(machine,0,port0a);
 	}
 	else if ((last & 0x02) == 0x00 && (data & 0x02) == 0x02)
 	{
@@ -637,9 +637,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
 	{
 		/* bit 2 goes to the 8910 #1 BC1 pin */
 		if (last & 0x04)
-			AY8910_control_port_1_w(machine,0,port0a);
+			ay8910_control_port_1_w(machine,0,port0a);
 		else
-			AY8910_write_port_1_w(machine,0,port0a);
+			ay8910_write_port_1_w(machine,0,port0a);
 	}
 	else if ((last & 0x08) == 0x00 && (data & 0x08) == 0x08)
 	{
diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c
index e29a8dabede..b04c19c5e20 100644
--- a/src/mame/drivers/lasso.c
+++ b/src/mame/drivers/lasso.c
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( wwjgtin_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x7fff) AM_MIRROR(0x8000) AM_ROM
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_RAM) AM_BASE(&lasso_chip_data)
 	AM_RANGE(0xb001, 0xb001) AM_WRITE(sound_select_w)
-	AM_RANGE(0xb003, 0xb003) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0xb003, 0xb003) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0xb004, 0xb004) AM_READ(sound_status_r)
 	AM_RANGE(0xb005, 0xb005) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -198,12 +198,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pinbo_audio_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x06, 0x06) AM_READ(ay8910_read_port_1_r)
 	AM_RANGE(0x08, 0x08) AM_READWRITE(soundlatch_r, SMH_NOP) /* ??? */
 	AM_RANGE(0x14, 0x14) AM_WRITE(SMH_NOP)	/* ??? */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/lastduel.c b/src/mame/drivers/lastduel.c
index e33d8fef969..7da662d29bc 100644
--- a/src/mame/drivers/lastduel.c
+++ b/src/mame/drivers/lastduel.c
@@ -107,18 +107,18 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xdfff) AM_READ(SMH_ROM)
 	AM_RANGE(0xe000, 0xe7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_1_r)
+	AM_RANGE(0xe800, 0xe800) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xf000, 0xf000) AM_READ(ym2203_status_port_1_r)
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xdfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe801, 0xe801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xe800, 0xe800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe801, 0xe801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 static WRITE8_HANDLER( mg_bankswitch_w )
@@ -134,18 +134,18 @@ static ADDRESS_MAP_START( mg_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0xcfff) AM_READ(SMH_BANK3)
 	AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xf002, 0xf002) AM_READ(YM2203_status_port_1_r)
+	AM_RANGE(0xf000, 0xf000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xf002, 0xf002) AM_READ(ym2203_status_port_1_r)
 	AM_RANGE(0xf006, 0xf006) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mg_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xf002, 0xf002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xf003, 0xf003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xf002, 0xf002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xf003, 0xf003) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xf004, 0xf004) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0xf00a, 0xf00a) AM_WRITE(mg_bankswitch_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c
index 71cc7a519d3..a68bcedf0e8 100644
--- a/src/mame/drivers/lazercmd.c
+++ b/src/mame/drivers/lazercmd.c
@@ -300,11 +300,11 @@ static WRITE8_HANDLER( lazercmd_hardware_w )
 			DAC_data=(data&0x80)^((data&0x40)<<1)^((data&0x20)<<2)^((data&0x10)<<3);
 			if (DAC_data)
 			{
-				DAC_data_w(0, 0xff);
+				dac_data_w(0, 0xff);
 			}
 			else
 			{
-				DAC_data_w(0, 0);
+				dac_data_w(0, 0);
 			}
 			break;
 		case 1: /* marker Y position */
@@ -331,11 +331,11 @@ static WRITE8_HANDLER( medlanes_hardware_w )
 			DAC_data=((data&0x20)<<2)^((data&0x10)<<3);
 			if (DAC_data)
 			{
-				DAC_data_w(0, 0xff);
+				dac_data_w(0, 0xff);
 			}
 			else
 			{
-				DAC_data_w(0, 0);
+				dac_data_w(0, 0);
 			}
 			break;
 		case 1: /* marker Y position */
@@ -362,11 +362,11 @@ static WRITE8_HANDLER( bbonk_hardware_w )
 			DAC_data=((data&0x20)<<2)^((data&0x10)<<3);
 			if (DAC_data)
 			{
-				DAC_data_w(0, 0xff);
+				dac_data_w(0, 0xff);
 			}
 			else
 			{
-				DAC_data_w(0, 0);
+				dac_data_w(0, 0);
 			}
 			break;
 		case 3: /* D4 clears coin detected and D0 toggles on attract mode */
diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c
index 365574bdeb5..ba9a0aaaa2d 100644
--- a/src/mame/drivers/lemmings.c
+++ b/src/mame/drivers/lemmings.c
@@ -116,7 +116,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x0801, 0x0801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x0801, 0x0801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x1000, 0x1000) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x1800, 0x1800) AM_READ(soundlatch_r)
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
@@ -124,8 +124,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x1000, 0x1000) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(lemmings_sound_ack_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
diff --git a/src/mame/drivers/liberate.c b/src/mame/drivers/liberate.c
index f147e43acbb..fb3812fbfdc 100644
--- a/src/mame/drivers/liberate.c
+++ b/src/mame/drivers/liberate.c
@@ -171,10 +171,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( prosoccr_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
     AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_1_w)
     AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 #endif
@@ -187,10 +187,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
     AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x3000, 0x3000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x3000, 0x3000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_1_w)
     AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/lkage.c b/src/mame/drivers/lkage.c
index a2585c9ccf3..ed96972ea9c 100644
--- a/src/mame/drivers/lkage.c
+++ b/src/mame/drivers/lkage.c
@@ -122,8 +122,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_1_r)
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym2203_status_port_1_r)
 	AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r)
 	AM_RANGE(0xb001, 0xb001) AM_READ(SMH_NOP)	/* ??? */
 	AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM)	/* space for diagnostic ROM? */
@@ -132,10 +132,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP)	/* ??? */
 	AM_RANGE(0xb001, 0xb001) AM_WRITE(lkage_sh_nmi_enable_w)
 	AM_RANGE(0xb002, 0xb002) AM_WRITE(lkage_sh_nmi_disable_w)
diff --git a/src/mame/drivers/lockon.c b/src/mame/drivers/lockon.c
index fa2c3486c3e..bd1bb96331d 100644
--- a/src/mame/drivers/lockon.c
+++ b/src/mame/drivers/lockon.c
@@ -226,8 +226,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_NOP
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/looping.c b/src/mame/drivers/looping.c
index 11c17ac178c..80bd36111c4 100644
--- a/src/mame/drivers/looping.c
+++ b/src/mame/drivers/looping.c
@@ -366,7 +366,7 @@ static WRITE8_HANDLER( looping_sound_sw )
 
 	looping_state *state = machine->driver_data;
 	state->sound[offset + 1] = data ^ 1;
-	DAC_data_w(0, ((state->sound[2] << 7) + (state->sound[3] << 6)) * state->sound[7]);
+	dac_data_w(0, ((state->sound[2] << 7) + (state->sound[3] << 6)) * state->sound[7]);
 }
 
 
@@ -498,8 +498,8 @@ static ADDRESS_MAP_START( looping_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0x3fff)
 	AM_RANGE(0x0000, 0x37ff) AM_ROM
 	AM_RANGE(0x3800, 0x3bff) AM_RAM
-	AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READWRITE(SMH_NOP, AY8910_write_port_0_w)
+	AM_RANGE(0x3c00, 0x3c00) AM_MIRROR(0x00f4) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x3c02, 0x3c02) AM_MIRROR(0x00f4) AM_READWRITE(SMH_NOP, ay8910_write_port_0_w)
 	AM_RANGE(0x3c03, 0x3c03) AM_MIRROR(0x00f6) AM_NOP
 	AM_RANGE(0x3e00, 0x3e00) AM_MIRROR(0x00f4) AM_READWRITE(SMH_NOP, tms5220_data_w)
 	AM_RANGE(0x3e02, 0x3e02) AM_MIRROR(0x00f4) AM_READWRITE(tms5220_status_r, SMH_NOP)
diff --git a/src/mame/drivers/lordgun.c b/src/mame/drivers/lordgun.c
index 97cde768335..2c1cca05bfb 100644
--- a/src/mame/drivers/lordgun.c
+++ b/src/mame/drivers/lordgun.c
@@ -246,8 +246,8 @@ static WRITE8_HANDLER( lordgun_okibank_w )
 }
 
 static ADDRESS_MAP_START( lordgun_soundio_map, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(0x1000, 0x1000) AM_WRITE( YM3812_control_port_0_w )
-	AM_RANGE(0x1001, 0x1001) AM_WRITE( YM3812_write_port_0_w )
+	AM_RANGE(0x1000, 0x1000) AM_WRITE( ym3812_control_port_0_w )
+	AM_RANGE(0x1001, 0x1001) AM_WRITE( ym3812_write_port_0_w )
 	AM_RANGE(0x2000, 0x2000) AM_READWRITE( okim6295_status_0_r, okim6295_data_0_w )
 	AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r )
 	AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r )
@@ -260,8 +260,8 @@ static ADDRESS_MAP_START( hfh_soundio_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x3000, 0x3000) AM_READ( soundlatch2_r )
 	AM_RANGE(0x4000, 0x4000) AM_READ( soundlatch_r )
 	AM_RANGE(0x5000, 0x5000) AM_READ( SMH_NOP )
-	AM_RANGE(0x7000, 0x7000) AM_WRITE( YM3812_control_port_0_w )
-	AM_RANGE(0x7001, 0x7001) AM_WRITE( YM3812_write_port_0_w )
+	AM_RANGE(0x7000, 0x7000) AM_WRITE( ym3812_control_port_0_w )
+	AM_RANGE(0x7001, 0x7001) AM_WRITE( ym3812_write_port_0_w )
 	AM_RANGE(0x7400, 0x7400) AM_READWRITE( okim6295_status_0_r, okim6295_data_0_w )
 	AM_RANGE(0x7800, 0x7800) AM_READWRITE( okim6295_status_1_r, okim6295_data_1_w )
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/lsasquad.c b/src/mame/drivers/lsasquad.c
index 4dd8c0adf5f..6a1c9f69d50 100644
--- a/src/mame/drivers/lsasquad.c
+++ b/src/mame/drivers/lsasquad.c
@@ -198,8 +198,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0xd000, 0xd000) AM_READ(lsasquad_sh_sound_command_r)
 	AM_RANGE(0xd800, 0xd800) AM_READ(lsasquad_sound_status_r)
 	AM_RANGE(0xe000, 0xefff) AM_READ(SMH_ROM)	/* space for diagnostic ROM? */
@@ -208,10 +208,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(lsasquad_sh_result_w)
 	AM_RANGE(0xd400, 0xd400) AM_WRITE(lsasquad_sh_nmi_disable_w)
 	AM_RANGE(0xd800, 0xd800) AM_WRITE(lsasquad_sh_nmi_enable_w)
@@ -387,10 +387,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_mem_daikaiju, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0xa000, 0xa000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xd000, 0xd000) AM_READ(daikaiju_sh_sound_command_r)
 	AM_RANGE(0xd400, 0xd400) AM_WRITENOP
 	AM_RANGE(0xd800, 0xd800) AM_READ(daikaiju_sound_status_r) AM_WRITENOP
diff --git a/src/mame/drivers/ltcasino.c b/src/mame/drivers/ltcasino.c
index 6fd4117b7f0..34fb20b82b2 100644
--- a/src/mame/drivers/ltcasino.c
+++ b/src/mame/drivers/ltcasino.c
@@ -69,7 +69,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xec10, 0xec10) AM_READ(input_port_4_r)
 	AM_RANGE(0xec12, 0xec12) AM_READ(input_port_5_r)
 
-	AM_RANGE(0xec20, 0xec20) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xec20, 0xec20) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0xec21, 0xec21) AM_READ(input_port_6_r) //ltcasino -> pc: F3F3 (A in service) and F3FD (B in service)
 	AM_RANGE(0xec3e, 0xec3e) AM_READ(SMH_NOP) //not used
 
@@ -85,8 +85,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(ltcasino_tile_atr_w) AM_BASE(&ltcasino_tile_atr_ram)
 	AM_RANGE(0xe800, 0xebff) AM_WRITE(SMH_RAM)
 
-	AM_RANGE(0xec20, 0xec20) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xec21, 0xec21) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xec20, 0xec20) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xec21, 0xec21) AM_WRITE(ay8910_control_port_0_w)
 
 	AM_RANGE(0xec30, 0xec3f) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM)
diff --git a/src/mame/drivers/lucky74.c b/src/mame/drivers/lucky74.c
index 241d884cf3b..4f7fd35c140 100644
--- a/src/mame/drivers/lucky74.c
+++ b/src/mame/drivers/lucky74.c
@@ -821,9 +821,9 @@ static ADDRESS_MAP_START( lucky74_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xf100, 0xf100) AM_WRITE(sn76496_0_w)											/* SN76489 #1 */
 	AM_RANGE(0xf200, 0xf203) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w)	/* Input Ports 2 & 4 */
 	AM_RANGE(0xf300, 0xf300) AM_WRITE(sn76496_1_w)											/* SN76489 #2 */
-	AM_RANGE(0xf400, 0xf400) AM_WRITE(AY8910_control_port_0_w)								/* YM2149 control */
+	AM_RANGE(0xf400, 0xf400) AM_WRITE(ay8910_control_port_0_w)								/* YM2149 control */
 	AM_RANGE(0xf500, 0xf500) AM_WRITE(sn76496_2_w)											/* SN76489 #3 */
-	AM_RANGE(0xf600, 0xf600) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)		/* YM2149 (Input Port 1) */
+	AM_RANGE(0xf600, 0xf600) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)		/* YM2149 (Input Port 1) */
 	AM_RANGE(0xf700, 0xf701) AM_READWRITE(usart_8251_r, usart_8251_w)						/* USART 8251 port */
 	AM_RANGE(0xf800, 0xf803) AM_READWRITE(copro_sm7831_r, copro_sm7831_w)					/* SM7831 Co-Processor */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/lucky8.c b/src/mame/drivers/lucky8.c
index 078099764e5..4ae5644d8aa 100644
--- a/src/mame/drivers/lucky8.c
+++ b/src/mame/drivers/lucky8.c
@@ -116,8 +116,8 @@ static ADDRESS_MAP_START( lucky8_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xb821, 0xb821) AM_WRITENOP
 	AM_RANGE(0xb822, 0xb822) AM_WRITENOP
 	AM_RANGE(0xb823, 0xb823) AM_WRITENOP
-	AM_RANGE(0xb830, 0xb830) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0xb840, 0xb840) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xb830, 0xb830) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0xb840, 0xb840) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xb850, 0xb850) AM_WRITENOP
 	AM_RANGE(0xb860, 0xb860) AM_WRITENOP
 	AM_RANGE(0xb870, 0xb870) AM_WRITENOP
diff --git a/src/mame/drivers/lvcards.c b/src/mame/drivers/lvcards.c
index b9a3a942fa7..af1c075eefd 100644
--- a/src/mame/drivers/lvcards.c
+++ b/src/mame/drivers/lvcards.c
@@ -176,8 +176,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( lvcards_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( lvpoker_map, ADDRESS_SPACE_PROGRAM, 8  )
diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c
index 943371c423e..0f22a6e34af 100644
--- a/src/mame/drivers/lwings.c
+++ b/src/mame/drivers/lwings.c
@@ -353,10 +353,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xe006, 0xe006) AM_WRITE(SMH_RAM) AM_BASE(&avengers_soundlatch2)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/m107.c b/src/mame/drivers/m107.c
index 84bcebb5af8..c4db6c1c21e 100644
--- a/src/mame/drivers/m107.c
+++ b/src/mame/drivers/m107.c
@@ -182,9 +182,9 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x00000, 0x1ffff) AM_ROM
 	AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(SMH_NOP) /* Irq controller? */
 	AM_RANGE(0xa0000, 0xa3fff) AM_RAM
-	AM_RANGE(0xa8000, 0xa803f) AM_READWRITE(IremGA20_r, IremGA20_w)
-	AM_RANGE(0xa8040, 0xa8041) AM_WRITE(YM2151_register_port_0_lsb_w)
-	AM_RANGE(0xa8042, 0xa8043) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_data_port_0_lsb_w)
+	AM_RANGE(0xa8000, 0xa803f) AM_READWRITE(irem_ga20_r, irem_ga20_w)
+	AM_RANGE(0xa8040, 0xa8041) AM_WRITE(ym2151_register_port_0_lsb_w)
+	AM_RANGE(0xa8042, 0xa8043) AM_READWRITE(ym2151_status_port_0_lsb_r, ym2151_data_port_0_lsb_w)
 	AM_RANGE(0xa8044, 0xa8045) AM_READWRITE(m107_soundlatch_r, m107_sound_irq_ack_w)
 	AM_RANGE(0xa8046, 0xa8047) AM_WRITE(m107_sound_status_w)
 	AM_RANGE(0xffff0, 0xfffff) AM_ROM
diff --git a/src/mame/drivers/m63.c b/src/mame/drivers/m63.c
index ea49515f722..00d72fdf17b 100644
--- a/src/mame/drivers/m63.c
+++ b/src/mame/drivers/m63.c
@@ -331,13 +331,13 @@ static WRITE8_HANDLER( snddata_w )
 	int num_ays = (sndti_exists(SOUND_AY8910, 1)) ? 2 : 1;
 
 	if ((p2 & 0xf0) == 0xe0)
-		AY8910_control_port_0_w(machine,0,offset);
+		ay8910_control_port_0_w(machine,0,offset);
 	else if ((p2 & 0xf0) == 0xa0)
-		AY8910_write_port_0_w(machine,0,offset);
+		ay8910_write_port_0_w(machine,0,offset);
 	else if (num_ays == 2 && (p1 & 0xe0) == 0x60)
-		AY8910_control_port_1_w(machine,0,offset);
+		ay8910_control_port_1_w(machine,0,offset);
 	else if (num_ays == 2 && (p1 & 0xe0) == 0x40)
-		 AY8910_write_port_1_w(machine,0,offset);
+		 ay8910_write_port_1_w(machine,0,offset);
 	else if ((p2 & 0xf0) == 0x70 )
 		sound_status=offset;
 }
diff --git a/src/mame/drivers/m72.c b/src/mame/drivers/m72.c
index fc984a064a8..25d0a1a29a7 100644
--- a/src/mame/drivers/m72.c
+++ b/src/mame/drivers/m72.c
@@ -835,8 +835,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
 	AM_RANGE(0x06, 0x06) AM_WRITE(m72_sound_irq_ack_w)
 	AM_RANGE(0x82, 0x82) AM_WRITE(m72_sample_w)
@@ -845,8 +845,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( rtype2_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
 	AM_RANGE(0x80, 0x81) AM_WRITE(rtype2_sample_addr_w)
 	AM_RANGE(0x82, 0x82) AM_WRITE(m72_sample_w)
@@ -857,8 +857,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( poundfor_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x10, 0x13) AM_WRITE(poundfor_sample_addr_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x42, 0x42) AM_READ(soundlatch_r)
 	AM_RANGE(0x42, 0x42) AM_WRITE(m72_sound_irq_ack_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/m90.c b/src/mame/drivers/m90.c
index 17a1f50f6c2..9d8a59fd8e6 100644
--- a/src/mame/drivers/m90.c
+++ b/src/mame/drivers/m90.c
@@ -157,15 +157,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
 	AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x80, 0x81) AM_WRITE(rtype2_sample_addr_w)
 	AM_RANGE(0x82, 0x82) AM_WRITE(m72_sample_w)
 	AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w)
@@ -173,15 +173,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bbmanw_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x41, 0x41) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x41, 0x41) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x42, 0x42) AM_READ(soundlatch_r)
 //  AM_RANGE(0x41, 0x41) AM_READ(m72_sample_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bbmanw_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x42, 0x42) AM_WRITE(m72_sound_irq_ack_w)
 //  AM_RANGE(0x40, 0x41) AM_WRITE(rtype2_sample_addr_w)
 //  AM_RANGE(0x42, 0x42) AM_WRITE(m72_sample_w)
diff --git a/src/mame/drivers/m92.c b/src/mame/drivers/m92.c
index c2eb0f6fe18..2775f8091f9 100644
--- a/src/mame/drivers/m92.c
+++ b/src/mame/drivers/m92.c
@@ -412,9 +412,9 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x00000, 0x1ffff) AM_ROM
 	AM_RANGE(0x9ff00, 0x9ffff) AM_WRITE(SMH_NOP) /* Irq controller? */
 	AM_RANGE(0xa0000, 0xa3fff) AM_RAM
-	AM_RANGE(0xa8000, 0xa803f) AM_READWRITE(IremGA20_r, IremGA20_w)
-	AM_RANGE(0xa8040, 0xa8041) AM_WRITE(YM2151_register_port_0_lsb_w)
-	AM_RANGE(0xa8042, 0xa8043) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_data_port_0_lsb_w)
+	AM_RANGE(0xa8000, 0xa803f) AM_READWRITE(irem_ga20_r, irem_ga20_w)
+	AM_RANGE(0xa8040, 0xa8041) AM_WRITE(ym2151_register_port_0_lsb_w)
+	AM_RANGE(0xa8042, 0xa8043) AM_READWRITE(ym2151_status_port_0_lsb_r, ym2151_data_port_0_lsb_w)
 	AM_RANGE(0xa8044, 0xa8045) AM_READWRITE(m92_soundlatch_r, m92_sound_irq_ack_w)
 	AM_RANGE(0xa8046, 0xa8047) AM_WRITE(m92_sound_status_w)
 	AM_RANGE(0xffff0, 0xfffff) AM_ROM
diff --git a/src/mame/drivers/macrossp.c b/src/mame/drivers/macrossp.c
index 669087c3f23..2a014c1f507 100644
--- a/src/mame/drivers/macrossp.c
+++ b/src/mame/drivers/macrossp.c
@@ -443,14 +443,14 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x0fffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x200000, 0x207fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x400000, 0x40007f) AM_READ(ES5506_data_0_word_r)
+	AM_RANGE(0x400000, 0x40007f) AM_READ(es5506_data_0_word_r)
 	AM_RANGE(0x600000, 0x600001) AM_READ(macrossp_soundcmd_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x200000, 0x207fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x400000, 0x40007f) AM_WRITE(ES5506_data_0_word_w)
+	AM_RANGE(0x400000, 0x40007f) AM_WRITE(es5506_data_0_word_w)
 ADDRESS_MAP_END
 
 /*** INPUT PORTS *************************************************************/
diff --git a/src/mame/drivers/madalien.c b/src/mame/drivers/madalien.c
index e66f2d8e996..11bd60f6452 100644
--- a/src/mame/drivers/madalien.c
+++ b/src/mame/drivers/madalien.c
@@ -111,8 +111,8 @@ static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x03ff) AM_MIRROR(0x1c00) AM_RAM
 	AM_RANGE(0x6000, 0x6003) AM_MIRROR(0x1ffc) AM_RAM /* unknown device in an epoxy block, might be tilt detection */
 	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1ffc) AM_READ(madalien_sound_command_r)
-	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_MIRROR(0x1ffc) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_MIRROR(0x1ffc) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x8002, 0x8002) AM_MIRROR(0x1ffc) AM_WRITE(soundlatch2_w)
 	AM_RANGE(0xf800, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c
index d789f9edec5..9009bb12453 100644
--- a/src/mame/drivers/madmotor.c
+++ b/src/mame/drivers/madmotor.c
@@ -88,10 +88,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -100,10 +100,10 @@ static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
 	case 0:
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -111,8 +111,8 @@ static WRITE8_HANDLER( YM2203_w )
 /* Physical memory map (21 bits) */
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
-	AM_RANGE(0x100000, 0x100001) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x100000, 0x100001) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c
index 60212e32743..a123e02ebc8 100644
--- a/src/mame/drivers/magmax.c
+++ b/src/mame/drivers/magmax.c
@@ -232,12 +232,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( magmax_soundwriteport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/mainevt.c b/src/mame/drivers/mainevt.c
index 1a631e765a1..c30b8eede95 100644
--- a/src/mame/drivers/mainevt.c
+++ b/src/mame/drivers/mainevt.c
@@ -215,15 +215,15 @@ static ADDRESS_MAP_START( dv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x83ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( dv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x83ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(devstor_sh_irqcontrol_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(dv_sh_bankswitch_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/mainsnk.c b/src/mame/drivers/mainsnk.c
index 97c84cecf5e..9eace235955 100644
--- a/src/mame/drivers/mainsnk.c
+++ b/src/mame/drivers/mainsnk.c
@@ -141,11 +141,11 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(sound_command_r)
 	AM_RANGE(0xc000, 0xc000) AM_READ(sound_ack_r)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe002, 0xe007) AM_WRITE(snkwave_w)
-	AM_RANGE(0xe008, 0xe008) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xe009, 0xe009) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xe008, 0xe008) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xe009, 0xe009) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/mappy.c b/src/mame/drivers/mappy.c
index 1b4860e6421..f0035635213 100644
--- a/src/mame/drivers/mappy.c
+++ b/src/mame/drivers/mappy.c
@@ -2114,7 +2114,7 @@ ROM_END
 
 static WRITE8_HANDLER( grobda_DAC_w )
 {
-	DAC_data_w(0, (data << 4) | data);
+	dac_data_w(0, (data << 4) | data);
 }
 
 static DRIVER_INIT( grobda )
diff --git a/src/mame/drivers/marineb.c b/src/mame/drivers/marineb.c
index b06fd8031ce..ffa48bf99f6 100644
--- a/src/mame/drivers/marineb.c
+++ b/src/mame/drivers/marineb.c
@@ -72,16 +72,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( marineb_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( wanted_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/marvins.c b/src/mame/drivers/marvins.c
index 95bddfd8bc8..d4e48f4de3c 100644
--- a/src/mame/drivers/marvins.c
+++ b/src/mame/drivers/marvins.c
@@ -138,11 +138,11 @@ static READ8_HANDLER( marvins_port_0_r )
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM AM_BASE(&namco_wavedata)	/* silly hack - this shouldn't be here */
 	AM_RANGE(0x4000, 0x4000) AM_READ(sound_command_r)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x8002, 0x8007) AM_WRITE(snkwave_w)
-	AM_RANGE(0x8008, 0x8008) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8009, 0x8009) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x8008, 0x8008) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8009, 0x8009) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(sound_nmi_ack_r)
 	AM_RANGE(0xe000, 0xe7ff) AM_RAM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/matmania.c b/src/mame/drivers/matmania.c
index bb9314a8827..a3129ee6c35 100644
--- a/src/mame/drivers/matmania.c
+++ b/src/mame/drivers/matmania.c
@@ -47,7 +47,7 @@ static WRITE8_HANDLER( matmania_sh_command_w )
 
 static WRITE8_HANDLER( matmania_dac_w )
 {
-	DAC_signed_data_w(0,data);
+	dac_signed_data_w(0,data);
 }
 
 
@@ -126,10 +126,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2002, 0x2002) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x2003, 0x2003) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2002, 0x2002) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x2003, 0x2003) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x2004, 0x2004) AM_WRITE(matmania_dac_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
@@ -142,8 +142,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( maniach_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x2002, 0x2002) AM_WRITE(matmania_dac_w)
 	AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/mayumi.c b/src/mame/drivers/mayumi.c
index 1eb9c322c2b..8f905dbe32f 100644
--- a/src/mame/drivers/mayumi.c
+++ b/src/mame/drivers/mayumi.c
@@ -90,7 +90,7 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x30, 0x30) AM_READ_PORT("IN0")
 	AM_RANGE(0xc1, 0xc2) AM_READ(key_matrix_r)	// 0xc0-c3 8255ppi
-	AM_RANGE(0xd1, 0xd1) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xd1, 0xd1) AM_READ(ym2203_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
@@ -98,8 +98,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x30, 0x30) AM_WRITE(bank_sel_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(input_sel_w)
 	AM_RANGE(0xc3, 0xc3) AM_WRITE(SMH_NOP)		// 0xc0-c3 8255ppi
-	AM_RANGE(0xd0, 0xd0) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xd1, 0xd1) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xd0, 0xd0) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xd1, 0xd1) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 /****************************************************************************/
diff --git a/src/mame/drivers/mazerbla.c b/src/mame/drivers/mazerbla.c
index 04f544fb954..434aa18b9b1 100644
--- a/src/mame/drivers/mazerbla.c
+++ b/src/mame/drivers/mazerbla.c
@@ -1130,17 +1130,17 @@ static WRITE8_HANDLER( gg_led_ctrl_w )
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x2000, 0x27ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x4000, 0x4000) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x4000, 0x4000) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x2000, 0x27ff) AM_WRITE(SMH_RAM) /* main RAM (stack) */
 
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ay8910_write_port_1_w)
 
 	AM_RANGE(0x8000, 0x8000) AM_WRITE(sound_int_clear_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(sound_nmi_clear_w)
diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c
index 26e08bf0655..338fe9e687e 100644
--- a/src/mame/drivers/mcatadv.c
+++ b/src/mame/drivers/mcatadv.c
@@ -247,18 +247,18 @@ static ADDRESS_MAP_START( mcatadv_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM		)	// ROM
 	AM_RANGE(0x4000, 0xbfff) AM_READ(SMH_BANK1		)	// ROM
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM		)	// RAM
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r		)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r		)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r		)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r		)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mcatadv_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM		)	// ROM
 	AM_RANGE(0x4000, 0xbfff) AM_WRITE(SMH_ROM		)	// ROM
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM		)	// RAM
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(mcatadv_sound_bw_w)
 ADDRESS_MAP_END
 
@@ -287,17 +287,17 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( nost_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x04, 0x05) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x06, 0x07) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x04, 0x05) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x06, 0x07) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( nost_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(mcatadv_sound_bw_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(soundlatch2_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c
index 4dd3f1c1d16..5d98bd26d8c 100644
--- a/src/mame/drivers/megadriv.c
+++ b/src/mame/drivers/megadriv.c
@@ -1333,12 +1333,12 @@ static READ16_HANDLER( megadriv_68k_YM2612_read)
 		switch (offset)
 		{
 			case 0:
-				if (ACCESSING_BITS_8_15)	 return YM2612_status_port_0_A_r(machine, 0) << 8;
-				else 				 return YM2612_status_port_0_A_r(machine, 0);
+				if (ACCESSING_BITS_8_15)	 return ym2612_status_port_0_a_r(machine, 0) << 8;
+				else 				 return ym2612_status_port_0_a_r(machine, 0);
 				break;
 			case 1:
-				if (ACCESSING_BITS_8_15)	return YM2612_status_port_0_A_r(machine, 0) << 8;
-				else 				return YM2612_status_port_0_A_r(machine, 0);
+				if (ACCESSING_BITS_8_15)	return ym2612_status_port_0_a_r(machine, 0) << 8;
+				else 				return ym2612_status_port_0_a_r(machine, 0);
 				break;
 		}
 	}
@@ -1361,12 +1361,12 @@ static WRITE16_HANDLER( megadriv_68k_YM2612_write)
 		switch (offset)
 		{
 			case 0:
-				if (ACCESSING_BITS_8_15)	YM2612_control_port_0_A_w	(machine, 0,	(data >> 8) & 0xff);
-				else 				YM2612_data_port_0_A_w		(machine, 0,	(data >> 0) & 0xff);
+				if (ACCESSING_BITS_8_15)	ym2612_control_port_0_a_w	(machine, 0,	(data >> 8) & 0xff);
+				else 				ym2612_data_port_0_a_w		(machine, 0,	(data >> 0) & 0xff);
 				break;
 			case 1:
-				if (ACCESSING_BITS_8_15)	YM2612_control_port_0_B_w	(machine, 0,	(data >> 8) & 0xff);
-				else 				YM2612_data_port_0_B_w		(machine, 0,	(data >> 0) & 0xff);
+				if (ACCESSING_BITS_8_15)	ym2612_control_port_0_b_w	(machine, 0,	(data >> 8) & 0xff);
+				else 				ym2612_data_port_0_b_w		(machine, 0,	(data >> 0) & 0xff);
 				break;
 		}
 	}
@@ -1380,10 +1380,10 @@ static READ8_HANDLER( megadriv_z80_YM2612_read )
 {
 	switch (offset)
 	{
-		case 0: return YM2612_status_port_0_A_r(machine,0);
-		case 1: return YM2612_status_port_0_A_r(machine,0);
-		case 2: return YM2612_status_port_0_A_r(machine,0);
-		case 3: return YM2612_status_port_0_A_r(machine,0);
+		case 0: return ym2612_status_port_0_a_r(machine,0);
+		case 1: return ym2612_status_port_0_a_r(machine,0);
+		case 2: return ym2612_status_port_0_a_r(machine,0);
+		case 3: return ym2612_status_port_0_a_r(machine,0);
 
 	}
 
@@ -1395,10 +1395,10 @@ static WRITE8_HANDLER( megadriv_z80_YM2612_write )
 	//mame_printf_debug("megadriv_z80_YM2612_write %02x %02x\n",offset,data);
 	switch (offset)
 	{
-		case 0: YM2612_control_port_0_A_w(machine, 0, data); break;
-		case 1: YM2612_data_port_0_A_w(machine, 0, data); break;
-		case 2: YM2612_control_port_0_B_w(machine, 0, data); break;
-		case 3: YM2612_data_port_0_B_w(machine, 0, data); break;
+		case 0: ym2612_control_port_0_a_w(machine, 0, data); break;
+		case 1: ym2612_data_port_0_a_w(machine, 0, data); break;
+		case 2: ym2612_control_port_0_b_w(machine, 0, data); break;
+		case 3: ym2612_data_port_0_b_w(machine, 0, data); break;
 	}
 }
 
diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c
index 72efc11b44f..f56f4d31e1e 100644
--- a/src/mame/drivers/megasys1.c
+++ b/src/mame/drivers/megasys1.c
@@ -468,7 +468,7 @@ static READ16_HANDLER( oki_status_1_r )
 static ADDRESS_MAP_START( sound_readmem_A, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r)
-	AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r)
+	AM_RANGE(0x080002, 0x080003) AM_READ(ym2151_status_port_0_lsb_r)
 	AM_RANGE(0x0a0000, 0x0a0001) AM_READ(oki_status_0_r)
 	AM_RANGE(0x0c0000, 0x0c0001) AM_READ(oki_status_1_r)
 	AM_RANGE(0x0e0000, 0x0fffff) AM_READ(SMH_RAM)
@@ -477,8 +477,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem_A, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w)	// to main cpu
-	AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w)
-	AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w)
+	AM_RANGE(0x080000, 0x080001) AM_WRITE(ym2151_register_port_0_lsb_w)
+	AM_RANGE(0x080002, 0x080003) AM_WRITE(ym2151_data_port_0_lsb_w)
 	AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(okim6295_data_0_lsb_w)
 	AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(okim6295_data_1_lsb_w)
 	AM_RANGE(0x0e0000, 0x0fffff) AM_WRITE(SMH_RAM)
@@ -498,7 +498,7 @@ static ADDRESS_MAP_START( sound_readmem_B, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x01ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x040000, 0x040001) AM_READ(soundlatch_word_r)	/* from main cpu */
 	AM_RANGE(0x060000, 0x060001) AM_READ(soundlatch_word_r)	/* from main cpu */
-	AM_RANGE(0x080002, 0x080003) AM_READ(YM2151_status_port_0_lsb_r)
+	AM_RANGE(0x080002, 0x080003) AM_READ(ym2151_status_port_0_lsb_r)
 	AM_RANGE(0x0a0000, 0x0a0001) AM_READ(oki_status_0_r)
 	AM_RANGE(0x0c0000, 0x0c0001) AM_READ(oki_status_1_r)
 	AM_RANGE(0x0e0000, 0x0effff) AM_READ(SMH_RAM)
@@ -508,8 +508,8 @@ static ADDRESS_MAP_START( sound_writemem_B, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x01ffff) AM_WRITE(SMH_ROM	)
 	AM_RANGE(0x040000, 0x040001) AM_WRITE(soundlatch2_word_w)	/* to main cpu */
 	AM_RANGE(0x060000, 0x060001) AM_WRITE(soundlatch2_word_w)	/* to main cpu */
-	AM_RANGE(0x080000, 0x080001) AM_WRITE(YM2151_register_port_0_lsb_w)
-	AM_RANGE(0x080002, 0x080003) AM_WRITE(YM2151_data_port_0_lsb_w)
+	AM_RANGE(0x080000, 0x080001) AM_WRITE(ym2151_register_port_0_lsb_w)
+	AM_RANGE(0x080002, 0x080003) AM_WRITE(ym2151_data_port_0_lsb_w)
 	AM_RANGE(0x0a0000, 0x0a0003) AM_WRITE(okim6295_data_0_lsb_w)
 	AM_RANGE(0x0c0000, 0x0c0003) AM_WRITE(okim6295_data_1_lsb_w)
 	AM_RANGE(0x0e0000, 0x0effff) AM_WRITE(SMH_RAM)
@@ -541,13 +541,13 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2203_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/megazone.c b/src/mame/drivers/megazone.c
index 9ce56716bb7..6ca53ba0293 100644
--- a/src/mame/drivers/megazone.c
+++ b/src/mame/drivers/megazone.c
@@ -134,13 +134,13 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x02) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x00, 0x02) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( i8039_readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -156,7 +156,7 @@ static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( i8039_writeport, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(i8039_irqen_and_status_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/meijinsn.c b/src/mame/drivers/meijinsn.c
index f59b0f447a5..83825bc23c4 100644
--- a/src/mame/drivers/meijinsn.c
+++ b/src/mame/drivers/meijinsn.c
@@ -160,8 +160,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( meijinsn_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_clear_w)
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/merit.c b/src/mame/drivers/merit.c
index 67a79a9fed0..cc9f8867f23 100644
--- a/src/mame/drivers/merit.c
+++ b/src/mame/drivers/merit.c
@@ -214,8 +214,8 @@ static ADDRESS_MAP_START( trvwhiz_map, ADDRESS_SPACE_PROGRAM, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( trvwhiz_io_map, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8100, 0x8100) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8100, 0x8100) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -234,8 +234,8 @@ static ADDRESS_MAP_START( phrcraze_map, ADDRESS_SPACE_PROGRAM, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( phrcraze_io_map, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(0xc004, 0xc004) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc104, 0xc104) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc004, 0xc004) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc104, 0xc104) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -254,8 +254,8 @@ static ADDRESS_MAP_START( tictac_map, ADDRESS_SPACE_PROGRAM, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tictac_io_map, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(0xc00c, 0xc00c) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc10c, 0xc10c) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xc00c, 0xc00c) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc10c, 0xc10c) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index fd466ab3712..0ef274a825d 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -558,8 +558,8 @@ static ADDRESS_MAP_START( meritm_crt250_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x30, 0x33) AM_DEVREADWRITE(PPI8255, "ppi8255", ppi8255_r, ppi8255_w)
 	AM_RANGE(0x40, 0x43) AM_READWRITE(z80pio_0_r, z80pio_0_w)
 	AM_RANGE(0x50, 0x53) AM_READWRITE(z80pio_1_r, z80pio_1_w)
-	AM_RANGE(0x80, 0x80) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xff, 0xff) AM_WRITE(meritm_crt250_bank_w)
 ADDRESS_MAP_END
 
@@ -585,8 +585,8 @@ static ADDRESS_MAP_START( meritm_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x43) AM_READWRITE(z80pio_0_r, z80pio_0_w)
 	AM_RANGE(0x50, 0x53) AM_READWRITE(z80pio_1_r, z80pio_1_w)
 	AM_RANGE(0x60, 0x67) AM_READWRITE(pc16552d_0_r,pc16552d_0_w)
-	AM_RANGE(0x80, 0x80) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xff, 0xff) AM_WRITE(meritm_bank_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 1963efab706..6ca11bb4ddf 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -111,14 +111,14 @@ static UINT8 *mermaid_AY8910_enable;
 
 static WRITE8_HANDLER( mermaid_AY8910_write_port_w )
 {
-	if (mermaid_AY8910_enable[0]) AY8910_write_port_0_w(machine, offset, data);
-	if (mermaid_AY8910_enable[1]) AY8910_write_port_1_w(machine, offset, data);
+	if (mermaid_AY8910_enable[0]) ay8910_write_port_0_w(machine, offset, data);
+	if (mermaid_AY8910_enable[1]) ay8910_write_port_1_w(machine, offset, data);
 }
 
 static WRITE8_HANDLER( mermaid_AY8910_control_port_w )
 {
-	if (mermaid_AY8910_enable[0]) AY8910_control_port_0_w(machine, offset, data);
-	if (mermaid_AY8910_enable[1]) AY8910_control_port_1_w(machine, offset, data);
+	if (mermaid_AY8910_enable[0]) ay8910_control_port_0_w(machine, offset, data);
+	if (mermaid_AY8910_enable[1]) ay8910_control_port_1_w(machine, offset, data);
 }
 
 /* Memory Map */
diff --git a/src/mame/drivers/metlclsh.c b/src/mame/drivers/metlclsh.c
index 87c72ef8c50..bfe9f3caa22 100644
--- a/src/mame/drivers/metlclsh.c
+++ b/src/mame/drivers/metlclsh.c
@@ -82,7 +82,7 @@ static ADDRESS_MAP_START( metlclsh_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc003, 0xc003) AM_READ_PORT("DSW")
 //  AM_RANGE(0xc800, 0xc82f) AM_READ(SMH_RAM                   )   // not actually read
 //  AM_RANGE(0xcc00, 0xcc2f) AM_READ(SMH_RAM                   )   // ""
-	AM_RANGE(0xd000, 0xd000) AM_READ(YM2203_status_port_0_r	)
+	AM_RANGE(0xd000, 0xd000) AM_READ(ym2203_status_port_0_r	)
 //  AM_RANGE(0xd800, 0xdfff) AM_READ(SMH_RAM                   )   // not actually read
 	AM_RANGE(0xe800, 0xe9ff) AM_READ(SMH_RAM					)
 	AM_RANGE(0xfff0, 0xffff) AM_READ(SMH_ROM					)	// Reset/IRQ vectors
@@ -97,10 +97,10 @@ static ADDRESS_MAP_START( metlclsh_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc0c3, 0xc0c3) AM_WRITE(metlclsh_ack_nmi			)	// nmi ack
 	AM_RANGE(0xc800, 0xc82f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split1_w) AM_BASE(&paletteram		)
 	AM_RANGE(0xcc00, 0xcc2f) AM_WRITE(paletteram_xxxxBBBBGGGGRRRR_split2_w) AM_BASE(&paletteram_2	)
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(YM2203_control_port_0_w	)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(YM2203_write_port_0_w		)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM3526_control_port_0_w	)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM3526_write_port_0_w		)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ym2203_control_port_0_w	)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ym2203_write_port_0_w		)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym3526_control_port_0_w	)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym3526_write_port_0_w		)
 	AM_RANGE(0xe800, 0xe9ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size	)
 	AM_RANGE(0xd800, 0xdfff) AM_WRITE(metlclsh_fgram_w) AM_BASE(&metlclsh_fgram		)
 	AM_RANGE(0xfff0, 0xffff) AM_WRITE(SMH_ROM					)
diff --git a/src/mame/drivers/metro.c b/src/mame/drivers/metro.c
index 89713464d8a..0362961484d 100644
--- a/src/mame/drivers/metro.c
+++ b/src/mame/drivers/metro.c
@@ -441,9 +441,9 @@ static WRITE8_HANDLER( metro_portb_w )
 		{
 			/* write */
 			if (BIT(data,1))
-				YM2413_data_port_0_w(machine,0,porta);
+				ym2413_data_port_0_w(machine,0,porta);
 			else
-				YM2413_register_port_0_w(machine,0,porta);
+				ym2413_register_port_0_w(machine,0,porta);
 		}
 		portb = data;
 		return;
@@ -485,15 +485,15 @@ static WRITE8_HANDLER( daitorid_portb_w )
 		{
 			/* write */
 			if (BIT(data,1))
-				YM2151_data_port_0_w(machine,0,porta);
+				ym2151_data_port_0_w(machine,0,porta);
 			else
-				YM2151_register_port_0_w(machine,0,porta);
+				ym2151_register_port_0_w(machine,0,porta);
 		}
 		if (!BIT(data,3))
 		{
 			/* read */
 			if (BIT(data,1))
-				porta = YM2151_status_port_0_r(machine,0);
+				porta = ym2151_status_port_0_r(machine,0);
 		}
 		portb = data;
 		return;
@@ -527,7 +527,7 @@ static const ym2151_interface ym2151_config =
 
 static READ16_HANDLER( ymf278b_r )
 {
-	return YMF278B_status_port_0_r(machine, 0);
+	return ymf278b_status_port_0_r(machine, 0);
 }
 
 static WRITE16_HANDLER( ymf278b_w )
@@ -536,28 +536,28 @@ static WRITE16_HANDLER( ymf278b_w )
 		switch(offset)
 		{
 			case 0:
-				YMF278B_control_port_0_A_w(machine, 0, data);
+				ymf278b_control_port_0_a_w(machine, 0, data);
 				break;
 			case 1:
-				YMF278B_data_port_0_A_w(machine, 0, data);
+				ymf278b_data_port_0_a_w(machine, 0, data);
 				break;
 			case 2:
-				YMF278B_control_port_0_B_w(machine, 0, data);
+				ymf278b_control_port_0_b_w(machine, 0, data);
 				break;
 			case 3:
-				YMF278B_data_port_0_B_w(machine, 0, data);
+				ymf278b_data_port_0_b_w(machine, 0, data);
 				break;
 			case 4:
-				YMF278B_control_port_0_C_w(machine, 0, data);
+				ymf278b_control_port_0_c_w(machine, 0, data);
 				break;
 			case 5:
-				YMF278B_data_port_0_C_w(machine, 0, data);
+				ymf278b_data_port_0_c_w(machine, 0, data);
 				break;
 		}
 }
 
 
-static const struct YMF278B_interface ymf278b_interface =
+static const ymf278b_interface ymf278b_config =
 {
 	ymf278b_interrupt
 };
@@ -1477,8 +1477,8 @@ static ADDRESS_MAP_START( gakusai_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x279700, 0x279713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs	)	// Video Registers
 	AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP						)	// ? 5
 	AM_RANGE(0x500000, 0x500001) AM_WRITE(gakusai_oki_bank_lo_w			)	// Sound
-	AM_RANGE(0x600000, 0x600001) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0x600002, 0x600003) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0x600000, 0x600001) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0x600002, 0x600003) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0x700000, 0x700001) AM_WRITE(okim6295_data_0_lsb_w 		)
 	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(gakusai_eeprom_w				)	// EEPROM
 	AM_RANGE(0xd00000, 0xd00001) AM_WRITE(gakusai_oki_bank_hi_w			)
@@ -1534,8 +1534,8 @@ static ADDRESS_MAP_START( gakusai2_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x900000, 0x900001) AM_WRITE(gakusai_oki_bank_lo_w			)	// Sound
 	AM_RANGE(0xa00000, 0xa00001) AM_WRITE(gakusai_oki_bank_hi_w			)
 	AM_RANGE(0xb00000, 0xb00001) AM_WRITE(okim6295_data_0_lsb_w 		)
-	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0xe00000, 0xe00001) AM_WRITE(gakusai_eeprom_w				)	// EEPROM
 ADDRESS_MAP_END
 
@@ -1616,8 +1616,8 @@ static ADDRESS_MAP_START( dokyusp_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x279700, 0x279713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs	)	// Video Registers
 	AM_RANGE(0x400000, 0x400001) AM_WRITE(SMH_NOP						)	// ? 5
 	AM_RANGE(0x500000, 0x500001) AM_WRITE(gakusai_oki_bank_lo_w			)	// Sound
-	AM_RANGE(0x600000, 0x600001) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0x600002, 0x600003) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0x600000, 0x600001) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0x600002, 0x600003) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0x700000, 0x700001) AM_WRITE(okim6295_data_0_lsb_w 		)
 	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(dokyusp_eeprom_reset_w		)	// EEPROM
 	AM_RANGE(0xd00000, 0xd00001) AM_WRITE(dokyusp_eeprom_bit_w			)	// EEPROM
@@ -1671,8 +1671,8 @@ static ADDRESS_MAP_START( dokyusei_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x800000, 0x800001) AM_WRITE(gakusai_oki_bank_hi_w			)	// Samples Bank?
 	AM_RANGE(0x900000, 0x900001) AM_WRITE(SMH_NOP						)	// ? 4
 	AM_RANGE(0xa00000, 0xa00001) AM_WRITE(gakusai_oki_bank_lo_w			)	// Samples Bank
-	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2413_register_port_0_lsb_w	)	// Sound
-	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2413_data_port_0_lsb_w		)	//
+	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(ym2413_register_port_0_lsb_w	)	// Sound
+	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(ym2413_data_port_0_lsb_w		)	//
 	AM_RANGE(0xd00000, 0xd00001) AM_WRITE(okim6295_data_0_lsb_w			)	//
 ADDRESS_MAP_END
 
@@ -1959,18 +1959,18 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( blzntrnd_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r)
-	AM_RANGE(0x80, 0x80) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x82, 0x82) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x80, 0x80) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x82, 0x82) AM_READ(ym2610_status_port_0_b_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( blzntrnd_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(blzntrnd_sh_bankswitch_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( blzntrnd_readmem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -2069,8 +2069,8 @@ static ADDRESS_MAP_START( mouja_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x478850, 0x47885b) AM_WRITE(SMH_RAM) AM_BASE(&metro_scroll		)	// Scroll Regs
 	AM_RANGE(0x478888, 0x478889) AM_WRITE(SMH_NOP)								// ??
 	AM_RANGE(0x479700, 0x479713) AM_WRITE(SMH_RAM) AM_BASE(&metro_videoregs	)	// Video Registers
-	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2413_register_port_0_lsb_w	)
-	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2413_data_port_0_lsb_w		)
+	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(ym2413_register_port_0_lsb_w	)
+	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(ym2413_data_port_0_lsb_w		)
 	AM_RANGE(0x800000, 0x800001) AM_WRITE(mouja_sound_rombank_w			)
 	AM_RANGE(0xd00000, 0xd00001) AM_WRITE(okim6295_data_0_msb_w  		)
 
@@ -2104,8 +2104,8 @@ static ADDRESS_MAP_START( puzzlet_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE( 0x470000, 0x47dfff ) AM_RAM
 
 	AM_RANGE( 0x500000, 0x500001 ) AM_READWRITE( okim6295_status_0_msb_r, okim6295_data_0_msb_w )
-	AM_RANGE( 0x580000, 0x580001 ) AM_WRITE( YM2413_register_port_0_msb_w )
-	AM_RANGE( 0x580002, 0x580003 ) AM_WRITE( YM2413_data_port_0_msb_w )
+	AM_RANGE( 0x580000, 0x580001 ) AM_WRITE( ym2413_register_port_0_msb_w )
+	AM_RANGE( 0x580002, 0x580003 ) AM_WRITE( ym2413_data_port_0_msb_w )
 
 	AM_RANGE( 0x700000, 0x71ffff ) AM_READWRITE( SMH_RAM, metro_vram_0_w ) AM_BASE( &metro_vram_0 )	// Layer 0
 	AM_RANGE( 0x720000, 0x73ffff ) AM_READWRITE( SMH_RAM, metro_vram_1_w ) AM_BASE( &metro_vram_1 )	// Layer 1
@@ -3782,7 +3782,7 @@ static MACHINE_DRIVER_START( balcube )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
-	MDRV_SOUND_CONFIG(ymf278b_interface)
+	MDRV_SOUND_CONFIG(ymf278b_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
@@ -3815,7 +3815,7 @@ static MACHINE_DRIVER_START( bangball )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
-	MDRV_SOUND_CONFIG(ymf278b_interface)
+	MDRV_SOUND_CONFIG(ymf278b_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
@@ -3848,7 +3848,7 @@ static MACHINE_DRIVER_START( batlbubl )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
-	MDRV_SOUND_CONFIG(ymf278b_interface)
+	MDRV_SOUND_CONFIG(ymf278b_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mexico86.c b/src/mame/drivers/mexico86.c
index 55f12be32b5..85d95af92c4 100644
--- a/src/mame/drivers/mexico86.c
+++ b/src/mame/drivers/mexico86.c
@@ -54,7 +54,7 @@ PS4  J8635      PS4  J8541       PS4  J8648
 //AT
 static READ8_HANDLER( kiki_2203_r )
 {
-	return(YM2203_status_port_0_r(machine,0) & 0x7f);
+	return(ym2203_status_port_0_r(machine,0) & 0x7f);
 }
 //ZT
 
@@ -100,15 +100,15 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xa7ff) AM_READ(shared_r)
 	AM_RANGE(0xa800, 0xbfff) AM_READ(SMH_RAM)
 	AM_RANGE(0xc000, 0xc000) AM_READ(kiki_2203_r) //AT
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2203_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0xa7ff) AM_WRITE(shared_w)
 	AM_RANGE(0xa800, 0xbfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( m68705_readmem, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/micro3d.c b/src/mame/drivers/micro3d.c
index 6877c97ef7f..e64dd8165fa 100644
--- a/src/mame/drivers/micro3d.c
+++ b/src/mame/drivers/micro3d.c
@@ -827,11 +827,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( soundmem_data, ADDRESS_SPACE_DATA, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM                                  /* 2Kb RAM */
-	AM_RANGE(0xfd00, 0xfd00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xfd01, 0xfd01) AM_READWRITE(YM2151_status_port_0_r,YM2151_data_port_0_w)
+	AM_RANGE(0xfd00, 0xfd00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xfd01, 0xfd01) AM_READWRITE(ym2151_status_port_0_r,ym2151_data_port_0_w)
 	AM_RANGE(0xfe00, 0xfe00) AM_WRITE(upd7759_0_port_w)
-	AM_RANGE(0xff00, 0xff00) AM_WRITE(DAC_0_data_w)   /* DAC A - used for S&H, special effects? */
-	AM_RANGE(0xff01, 0xff01) AM_WRITE(DAC_1_data_w)   /* DAC B - 'SPEECH' */
+	AM_RANGE(0xff00, 0xff00) AM_WRITE(dac_0_data_w)   /* DAC A - used for S&H, special effects? */
+	AM_RANGE(0xff01, 0xff01) AM_WRITE(dac_1_data_w)   /* DAC B - 'SPEECH' */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( soundmem_io, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/midas.c b/src/mame/drivers/midas.c
index 52d7ff07f4f..01242996474 100644
--- a/src/mame/drivers/midas.c
+++ b/src/mame/drivers/midas.c
@@ -242,8 +242,8 @@ static ADDRESS_MAP_START( mem_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xb40000, 0xb40001) AM_READ( ret_ffff )
 	AM_RANGE(0xb60000, 0xb60001) AM_READ( ret_ffff )
 
-	AM_RANGE(0xb80008, 0xb80009) AM_WRITE( YMZ280B_register_0_lsb_w )
-	AM_RANGE(0xb8000a, 0xb8000b) AM_READWRITE( YMZ280B_status_0_lsb_r, YMZ280B_data_0_lsb_w )
+	AM_RANGE(0xb80008, 0xb80009) AM_WRITE( ymz280b_register_0_lsb_w )
+	AM_RANGE(0xb8000a, 0xb8000b) AM_READWRITE( ymz280b_status_0_lsb_r, ymz280b_data_0_lsb_w )
 
 	AM_RANGE(0xba0000, 0xba0001) AM_READ_PORT("IN4")
 	AM_RANGE(0xbc0000, 0xbc0001) AM_READ_PORT("IN3")
@@ -431,7 +431,7 @@ static void livequiz_irqhandler(running_machine *machine, int state)
 	logerror("YMZ280 is generating an interrupt. State=%08x\n",state);
 }
 
-static const struct YMZ280Binterface ymz280b_interface =
+static const ymz280b_interface ymz280b_config =
 {
 	livequiz_irqhandler
 };
@@ -462,7 +462,7 @@ static MACHINE_DRIVER_START( livequiz )
 	/* sound hardware */
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 	MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
-	MDRV_SOUND_CONFIG(ymz280b_interface)
+	MDRV_SOUND_CONFIG(ymz280b_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.80)
 	MDRV_SOUND_ROUTE(1, "right", 0.80)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/mirax.c b/src/mame/drivers/mirax.c
index 767df156d8b..f4f5c317c23 100644
--- a/src/mame/drivers/mirax.c
+++ b/src/mame/drivers/mirax.c
@@ -106,8 +106,8 @@ static WRITE8_HANDLER(ay1_sel)
 {
 	if(activecpu_get_previouspc()==0x309)
 	{
-		AY8910_control_port_0_w(machine,0,nAyCtrl);
-		AY8910_write_port_0_w(machine,0,nAyData);
+		ay8910_control_port_0_w(machine,0,nAyCtrl);
+		ay8910_write_port_0_w(machine,0,nAyData);
 	}
 }
 
@@ -116,8 +116,8 @@ static WRITE8_HANDLER(ay2_sel)
 
 	if(activecpu_get_previouspc()==0x309)
 	{
-		AY8910_control_port_1_w(machine,0,nAyCtrl);
-		AY8910_write_port_1_w(machine,0,nAyData);
+		ay8910_control_port_1_w(machine,0,nAyCtrl);
+		ay8910_write_port_1_w(machine,0,nAyData);
 	}
 }
 
diff --git a/src/mame/drivers/missb2.c b/src/mame/drivers/missb2.c
index aa079feedc7..32707c0d11e 100644
--- a/src/mame/drivers/missb2.c
+++ b/src/mame/drivers/missb2.c
@@ -182,8 +182,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
 	AM_RANGE(0x9000, 0x9000) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
-	AM_RANGE(0xa000, 0xa000) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r) AM_WRITENOP // message for main cpu
 	AM_RANGE(0xb001, 0xb001) AM_READNOP AM_WRITE(bublbobl_sh_nmi_enable_w)	// bit 0: message pending for main cpu, bit 1: message pending for sound cpu
 	AM_RANGE(0xb002, 0xb002) AM_WRITE(bublbobl_sh_nmi_disable_w)
diff --git a/src/mame/drivers/mitchell.c b/src/mame/drivers/mitchell.c
index 823a694a264..c299f9fc4d6 100644
--- a/src/mame/drivers/mitchell.c
+++ b/src/mame/drivers/mitchell.c
@@ -398,8 +398,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_WRITE(pang_gfxctrl_w)    /* Palette bank, layer enable, coin counters, more */
 	AM_RANGE(0x01, 0x01) AM_WRITE(input_w)
 	AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w)      /* Code bank register */
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2413_data_port_0_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(YM2413_register_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2413_data_port_0_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ym2413_register_port_0_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP)	/* watchdog? irq ack? */
 	AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w)      /* Video RAM bank register */
@@ -426,8 +426,8 @@ static ADDRESS_MAP_START( spangb_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x02) AM_READ(input_r)	/* Super Pang needs a kludge to initialize EEPROM. */
 	AM_RANGE(0x00, 0x00) AM_WRITE(pang_gfxctrl_w)    /* Palette bank, layer enable, coin counters, more */
 	AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w)      /* Code bank register */
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2413_data_port_0_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(YM2413_register_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2413_data_port_0_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ym2413_register_port_0_w)
 	AM_RANGE(0x05, 0x05) AM_READ(pang_port5_r)
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP)	/* watchdog? irq ack? */
 	AM_RANGE(0x07, 0x07) AM_WRITE(pang_video_bank_w)      /* Video RAM bank register */
diff --git a/src/mame/drivers/mjsister.c b/src/mame/drivers/mjsister.c
index 8ac062dad09..e3566d6ef9e 100644
--- a/src/mame/drivers/mjsister.c
+++ b/src/mame/drivers/mjsister.c
@@ -37,7 +37,7 @@ static TIMER_CALLBACK( dac_callback )
 {
 	UINT8 *DACROM = memory_region(machine, "samples");
 
-	DAC_data_w(0,DACROM[(dac_bank * 0x10000 + dac_adr++) & 0x1ffff]);
+	dac_data_w(0,DACROM[(dac_bank * 0x10000 + dac_adr++) & 0x1ffff]);
 
 	if (((dac_adr & 0xff00 ) >> 8) !=  dac_adr_e )
 		timer_set(attotime_mul(ATTOTIME_IN_HZ(MCLK), 1024), NULL, 0, dac_callback);
@@ -164,7 +164,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mjsister_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x11, 0x11) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x11, 0x11) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x20, 0x20) AM_READ(mjsister_keys_r)
 	AM_RANGE(0x21, 0x21) AM_READ_PORT("IN0")
 ADDRESS_MAP_END
@@ -172,8 +172,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( mjsister_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x01) AM_WRITE(SMH_NOP) /* HD46505? */
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x12, 0x12) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x12, 0x12) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x30, 0x30) AM_WRITE(mjsister_banksel1_w)
 	AM_RANGE(0x31, 0x31) AM_WRITE(mjsister_banksel2_w)
 	AM_RANGE(0x32, 0x32) AM_WRITE(mjsister_input_sel1_w)
diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c
index 7c99502a6d4..c356409cc2e 100644
--- a/src/mame/drivers/mlanding.c
+++ b/src/mame/drivers/mlanding.c
@@ -171,8 +171,8 @@ static ADDRESS_MAP_START( mlanding_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_READ(ym2151_status_port_0_r) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r) AM_WRITE(taitosound_slave_comm_w)
diff --git a/src/mame/drivers/model1.c b/src/mame/drivers/model1.c
index 0aaa51b2195..492208c8b7c 100644
--- a/src/mame/drivers/model1.c
+++ b/src/mame/drivers/model1.c
@@ -1006,7 +1006,7 @@ static WRITE16_HANDLER( m1_snd_mpcm1_bnk_w )
 
 static READ16_HANDLER( m1_snd_ym_r )
 {
-	return YM3438_status_port_0_A_r(machine, 0);
+	return ym3438_status_port_0_a_r(machine, 0);
 }
 
 static WRITE16_HANDLER( m1_snd_ym_w )
@@ -1014,19 +1014,19 @@ static WRITE16_HANDLER( m1_snd_ym_w )
 	switch (offset)
 	{
 		case 0:
-			YM3438_control_port_0_A_w(machine, 0, data);
+			ym3438_control_port_0_a_w(machine, 0, data);
 			break;
 
 		case 1:
-			YM3438_data_port_0_A_w(machine, 0, data);
+			ym3438_data_port_0_a_w(machine, 0, data);
 			break;
 
 		case 2:
-			YM3438_control_port_0_B_w(machine, 0, data);
+			ym3438_control_port_0_b_w(machine, 0, data);
 			break;
 
 		case 3:
-			YM3438_data_port_0_B_w(machine, 0, data);
+			ym3438_data_port_0_b_w(machine, 0, data);
 			break;
 	}
 }
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 19de5997e15..de306668fe0 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -1647,7 +1647,7 @@ static WRITE16_HANDLER( m1_snd_mpcm1_bnk_w )
 
 static READ16_HANDLER( m1_snd_ym_r )
 {
-	return YM3438_status_port_0_A_r(machine, 0);
+	return ym3438_status_port_0_a_r(machine, 0);
 }
 
 static WRITE16_HANDLER( m1_snd_ym_w )
@@ -1655,19 +1655,19 @@ static WRITE16_HANDLER( m1_snd_ym_w )
 	switch (offset)
 	{
 		case 0:
-			YM3438_control_port_0_A_w(machine, 0, data);
+			ym3438_control_port_0_a_w(machine, 0, data);
 			break;
 
 		case 1:
-			YM3438_data_port_0_A_w(machine, 0, data);
+			ym3438_data_port_0_a_w(machine, 0, data);
 			break;
 
 		case 2:
-			YM3438_control_port_0_B_w(machine, 0, data);
+			ym3438_control_port_0_b_w(machine, 0, data);
 			break;
 
 		case 3:
-			YM3438_data_port_0_B_w(machine, 0, data);
+			ym3438_data_port_0_b_w(machine, 0, data);
 			break;
 	}
 }
diff --git a/src/mame/drivers/mogura.c b/src/mame/drivers/mogura.c
index 8dcff2032cf..adfe0357a19 100644
--- a/src/mame/drivers/mogura.c
+++ b/src/mame/drivers/mogura.c
@@ -100,8 +100,8 @@ ADDRESS_MAP_END
 
 static WRITE8_HANDLER(dac_w)
 {
-	DAC_0_data_w(machine, 0, data & 0xf0 );	/* left */
-	DAC_1_data_w(machine, 0, (data & 0x0f)<<4 );	/* right */
+	dac_0_data_w(machine, 0, data & 0xf0 );	/* left */
+	dac_1_data_w(machine, 0, (data & 0x0f)<<4 );	/* right */
 }
 
 
diff --git a/src/mame/drivers/mole.c b/src/mame/drivers/mole.c
index d3ff93c4fad..f639ce836a5 100644
--- a/src/mame/drivers/mole.c
+++ b/src/mame/drivers/mole.c
@@ -110,8 +110,8 @@ static ADDRESS_MAP_START( mole_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x5000, 0x7fff) AM_MIRROR(0x8000) AM_ROM
 	AM_RANGE(0x8000, 0x83ff) AM_RAM_WRITE(mole_videoram_w) AM_BASE(&videoram)
 	AM_RANGE(0x8400, 0x8400) AM_WRITE(mole_tilebank_w)
-	AM_RANGE(0x8c00, 0x8c00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8c01, 0x8c01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x8c00, 0x8c00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8c01, 0x8c01) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x8c40, 0x8c40) AM_WRITENOP // ???
 	AM_RANGE(0x8c80, 0x8c80) AM_WRITENOP // ???
 	AM_RANGE(0x8c81, 0x8c81) AM_WRITENOP // ???
diff --git a/src/mame/drivers/momoko.c b/src/mame/drivers/momoko.c
index 1947355900f..9048644362b 100644
--- a/src/mame/drivers/momoko.c
+++ b/src/mame/drivers/momoko.c
@@ -93,21 +93,21 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_0_r)
-	AM_RANGE(0xc000, 0xc000) AM_READ(YM2203_status_port_1_r)
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_1_r)
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_read_port_0_r)
+	AM_RANGE(0xc000, 0xc000) AM_READ(ym2203_status_port_1_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2203_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x9000, 0x9000) AM_WRITE(SMH_NOP) /* unknown */
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(SMH_NOP) /* unknown */
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 /****************************************************************************/
diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c
index 5d51894a726..8d26410065e 100644
--- a/src/mame/drivers/moo.c
+++ b/src/mame/drivers/moo.c
@@ -452,7 +452,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK2)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
 	AM_RANGE(0xe000, 0xe22f) AM_READ(k054539_0_r)
-	AM_RANGE(0xec01, 0xec01) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xec01, 0xec01) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r)
 	AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r)
 ADDRESS_MAP_END
@@ -461,8 +461,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe000, 0xe22f) AM_WRITE(k054539_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xec01, 0xec01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xec01, 0xec01) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w)
 	AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/mosaic.c b/src/mame/drivers/mosaic.c
index a0ce18d0b01..8f19b73fb43 100644
--- a/src/mame/drivers/mosaic.c
+++ b/src/mame/drivers/mosaic.c
@@ -129,8 +129,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x30, 0x30) AM_READ(SMH_NOP)	/* Z180 internal registers */
-	AM_RANGE(0x70, 0x70) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x71, 0x71) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x70, 0x70) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x71, 0x71) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0x72, 0x72) AM_READ(protection_r)
 	AM_RANGE(0x74, 0x74) AM_READ(input_port_0_r)
 	AM_RANGE(0x76, 0x76) AM_READ(input_port_1_r)
@@ -139,16 +139,16 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x3f) AM_WRITE(SMH_NOP)	/* Z180 internal registers */
-	AM_RANGE(0x70, 0x70) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x71, 0x71) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x70, 0x70) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x71, 0x71) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x72, 0x72) AM_WRITE(protection_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gfire2_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x30, 0x30) AM_READ(SMH_NOP)	/* Z180 internal registers */
-	AM_RANGE(0x70, 0x70) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x71, 0x71) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x70, 0x70) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x71, 0x71) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0x72, 0x72) AM_READ(gfire2_protection_r)
 	AM_RANGE(0x74, 0x74) AM_READ(input_port_0_r)
 	AM_RANGE(0x76, 0x76) AM_READ(input_port_1_r)
@@ -157,8 +157,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( gfire2_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x3f) AM_WRITE(SMH_NOP)	/* Z180 internal registers */
-	AM_RANGE(0x70, 0x70) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x71, 0x71) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x70, 0x70) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x71, 0x71) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x72, 0x72) AM_WRITE(gfire2_protection_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/mouser.c b/src/mame/drivers/mouser.c
index 0f70f70e33d..4ee28a4caa8 100644
--- a/src/mame/drivers/mouser.c
+++ b/src/mame/drivers/mouser.c
@@ -98,10 +98,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport2, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( mouser )
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index aca43a1be3f..5ee47ae5f12 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -768,14 +768,14 @@ static void update_ay(running_machine *machine)
 		  	}
 		  	case 0x02:
 			{/* CA2 = 0 CB2 = 1? : Write to selected PSG register and write data to Port A */
-	  			AY8910_write_port_0_w(machine, 0, pia_get_output_a(3));
+	  			ay8910_write_port_0_w(machine, 0, pia_get_output_a(3));
 				LOG(("AY Chip Write \n"));
 				break;
 	  		}
 		  	case 0x03:
 			{/* CA2 = 1 CB2 = 1? : The register will now be selected and the user can read from or write to it.
              The register will remain selected until another is chosen.*/
-				AY8910_control_port_0_w(machine, 0, pia_get_output_a(3));
+				ay8910_control_port_0_w(machine, 0, pia_get_output_a(3));
 				LOG(("AY Chip Select \n"));
 				break;
 	  		}
diff --git a/src/mame/drivers/mquake.c b/src/mame/drivers/mquake.c
index 31f4720876b..bbc8058ec85 100644
--- a/src/mame/drivers/mquake.c
+++ b/src/mame/drivers/mquake.c
@@ -89,7 +89,7 @@ static void mquake_cia_0_portb_w(UINT8 data)
 
 static READ16_HANDLER( es5503_word_lsb_r )
 {
-	return (ACCESSING_BITS_0_7) ? (ES5503_reg_0_r(machine, offset) | 0xff00) : 0xffff;
+	return (ACCESSING_BITS_0_7) ? (es5503_reg_0_r(machine, offset) | 0xff00) : 0xffff;
 }
 
 static WRITE16_HANDLER( es5503_word_lsb_w )
@@ -105,12 +105,12 @@ static WRITE16_HANDLER( es5503_word_lsb_w )
 				// if not writing a "halt", set the bank
 				if (!(data & 1))
 				{
-					ES5503_set_base_0(memory_region(machine, "ensoniq") + ((data>>4)*0x10000));
+					es5503_set_base_0(memory_region(machine, "ensoniq") + ((data>>4)*0x10000));
 				}
 			}
 		}
 
-		ES5503_reg_0_w(machine, offset, data);
+		es5503_reg_0_w(machine, offset, data);
 	}
 }
 
@@ -337,7 +337,7 @@ static const es5503_interface es5503_intf =
 static MACHINE_RESET(mquake)
 {
 	/* set ES5503 wave memory (this is banked in 64k increments) */
-	ES5503_set_base_0(memory_region(machine, "ensoniq"));
+	es5503_set_base_0(memory_region(machine, "ensoniq"));
 
 	MACHINE_RESET_CALL(amiga);
 }
diff --git a/src/mame/drivers/mrflea.c b/src/mame/drivers/mrflea.c
index 7ffd3379774..100306b538e 100644
--- a/src/mame/drivers/mrflea.c
+++ b/src/mame/drivers/mrflea.c
@@ -242,21 +242,21 @@ static ADDRESS_MAP_START( readport_io, ADDRESS_SPACE_IO, 8 )
 ADDRESS_MAP_END
 
 static WRITE8_HANDLER( mrflea_data0_w ){
-	AY8910_control_port_0_w( machine, offset, mrflea_select0 );
-	AY8910_write_port_0_w( machine, offset, data );
+	ay8910_control_port_0_w( machine, offset, mrflea_select0 );
+	ay8910_write_port_0_w( machine, offset, data );
 }
 
 static WRITE8_HANDLER( mrflea_data1_w ){
 }
 
 static WRITE8_HANDLER( mrflea_data2_w ){
-	AY8910_control_port_1_w( machine, offset, mrflea_select2 );
-	AY8910_write_port_1_w( machine, offset, data );
+	ay8910_control_port_1_w( machine, offset, mrflea_select2 );
+	ay8910_write_port_1_w( machine, offset, data );
 }
 
 static WRITE8_HANDLER( mrflea_data3_w ){
-	AY8910_control_port_2_w( machine, offset, mrflea_select3 );
-	AY8910_write_port_2_w( machine, offset, data );
+	ay8910_control_port_2_w( machine, offset, mrflea_select3 );
+	ay8910_write_port_2_w( machine, offset, data );
 }
 
 static ADDRESS_MAP_START( writeport_io, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/ms32.c b/src/mame/drivers/ms32.c
index b2d831e56b6..b70a09d7db2 100644
--- a/src/mame/drivers/ms32.c
+++ b/src/mame/drivers/ms32.c
@@ -1359,7 +1359,7 @@ static WRITE8_HANDLER( to_main_w )
 
 static ADDRESS_MAP_START( ms32_snd_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3eff) AM_READ(SMH_ROM)
-	AM_RANGE(0x3f00, 0x3f0f) AM_READ(YMF271_0_r)
+	AM_RANGE(0x3f00, 0x3f0f) AM_READ(ymf271_0_r)
 	AM_RANGE(0x3f10, 0x3f10) AM_READ(latch_r)
 	AM_RANGE(0x3f20, 0x3f20) AM_READ(SMH_NOP) /* 2nd latch ? */
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_RAM)
@@ -1369,7 +1369,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ms32_snd_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3eff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x3f00, 0x3f0f) AM_WRITE(YMF271_0_w)
+	AM_RANGE(0x3f00, 0x3f0f) AM_WRITE(ymf271_0_w)
 	AM_RANGE(0x3f10, 0x3f10) AM_WRITE(to_main_w)
 	AM_RANGE(0x3f20, 0x3f20) AM_WRITE(SMH_NOP) /* to_main2_w  ? */
 	AM_RANGE(0x3f40, 0x3f40) AM_WRITE(SMH_NOP)   /* YMF271 pin 4 (bit 1) , YMF271 pin 39 (bit 4) */
diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c
index 8f5acf08b92..b3ef58e7b6f 100644
--- a/src/mame/drivers/msisaac.c
+++ b/src/mame/drivers/msisaac.c
@@ -319,10 +319,10 @@ static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM)
 
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x8010, 0x801d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0x8020, 0x8020) AM_WRITE(sound_control_0_w)
 	AM_RANGE(0x8030, 0x8030) AM_WRITE(sound_control_1_w)
diff --git a/src/mame/drivers/mugsmash.c b/src/mame/drivers/mugsmash.c
index 2bf3b5924a9..4e44194bb0a 100644
--- a/src/mame/drivers/mugsmash.c
+++ b/src/mame/drivers/mugsmash.c
@@ -212,7 +212,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x8801, 0x8801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x9800, 0x9800) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -220,8 +220,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/munchmo.c b/src/mame/drivers/munchmo.c
index 068fd4c0e8d..bf37d1365ea 100644
--- a/src/mame/drivers/munchmo.c
+++ b/src/mame/drivers/munchmo.c
@@ -114,10 +114,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x5000, 0x5000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x7000, 0x7000) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP) /* ? */
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_NOP) /* ? */
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(sound_nmi_ack_w)
diff --git a/src/mame/drivers/mystston.c b/src/mame/drivers/mystston.c
index 1d32082de44..c15b2e8d255 100644
--- a/src/mame/drivers/mystston.c
+++ b/src/mame/drivers/mystston.c
@@ -78,9 +78,9 @@ static WRITE8_HANDLER( mystston_ay8910_select_w )
 	{
 		/* bit 4 goes to the 8910 #0 BC1 pin */
 		if (*state->ay8910_select & 0x10)
-			AY8910_control_port_0_w(machine, 0, *state->ay8910_data);
+			ay8910_control_port_0_w(machine, 0, *state->ay8910_data);
 		else
-			AY8910_write_port_0_w(machine, 0, *state->ay8910_data);
+			ay8910_write_port_0_w(machine, 0, *state->ay8910_data);
 	}
 
 	/* bit 7 goes to 8910 #1 BDIR pin */
@@ -88,9 +88,9 @@ static WRITE8_HANDLER( mystston_ay8910_select_w )
 	{
 		/* bit 6 goes to the 8910 #1 BC1 pin */
 		if (*state->ay8910_select & 0x40)
-			AY8910_control_port_1_w(machine, 0, *state->ay8910_data);
+			ay8910_control_port_1_w(machine, 0, *state->ay8910_data);
 		else
-			AY8910_write_port_1_w(machine, 0, *state->ay8910_data);
+			ay8910_write_port_1_w(machine, 0, *state->ay8910_data);
 	}
 
 	*state->ay8910_select = data;
diff --git a/src/mame/drivers/namcona1.c b/src/mame/drivers/namcona1.c
index adf11890ecf..6e66e7af45f 100644
--- a/src/mame/drivers/namcona1.c
+++ b/src/mame/drivers/namcona1.c
@@ -1081,19 +1081,19 @@ static WRITE16_HANDLER( na1mcu_shared_w )
 
 static READ16_HANDLER(snd_r)
 {
-	return C140_r(machine,offset*2+1) | C140_r(machine,offset*2)<<8;
+	return c140_r(machine,offset*2+1) | c140_r(machine,offset*2)<<8;
 }
 
 static WRITE16_HANDLER(snd_w)
 {
 	if (ACCESSING_BITS_0_7)
 	{
-		C140_w(machine,(offset*2)+1, data);
+		c140_w(machine,(offset*2)+1, data);
 	}
 
 	if (ACCESSING_BITS_8_15)
 	{
-		C140_w(machine,(offset*2), data>>8);
+		c140_w(machine,(offset*2), data>>8);
 	}
 }
 
@@ -1194,7 +1194,7 @@ static WRITE8_HANDLER( port8_w )
 
 static MACHINE_START( namcona1 )
 {
-	C140_set_base(0, namcona1_workram);
+	c140_set_base(0, namcona1_workram);
 }
 
 // for games with the MCU emulated, the MCU boots the 68000.  don't allow it before that.
diff --git a/src/mame/drivers/namcos1.c b/src/mame/drivers/namcos1.c
index 9e33d9fda33..819e9a3433d 100644
--- a/src/mame/drivers/namcos1.c
+++ b/src/mame/drivers/namcos1.c
@@ -384,7 +384,7 @@ static WRITE8_HANDLER( namcos1_coin_w )
 
 static void namcos1_update_DACs(void)
 {
-	DAC_signed_data_16_w(0,0x8000 + (dac0_value * dac0_gain) + (dac1_value * dac1_gain));
+	dac_signed_data_16_w(0,0x8000 + (dac0_value * dac0_gain) + (dac1_value * dac1_gain));
 }
 
 void namcos1_init_DACs(void)
@@ -464,9 +464,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROMBANK(17)	/* Banked ROMs */
-	AM_RANGE(0x4000, 0x4001) AM_READ(YM2151_status_port_0_r)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x4000, 0x4001) AM_READ(ym2151_status_port_0_r)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x5000, 0x53ff) AM_READWRITE(namcos1_cus30_r, namcos1_cus30_w) AM_MIRROR(0x400) AM_BASE(&namco_wavedata) /* PSG ( Shared ) */
 	AM_RANGE(0x7000, 0x77ff) AM_RAMBANK(18)	/* TRIRAM (shared) */
 	AM_RANGE(0x8000, 0x9fff) AM_RAM	/* Sound RAM 3 */
diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c
index 31a4bb0b6dd..c331ab22186 100644
--- a/src/mame/drivers/namcos2.c
+++ b/src/mame/drivers/namcos2.c
@@ -708,8 +708,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(BANKED_SOUND_ROM_R) /* banked */
-	AM_RANGE(0x4000, 0x4001) AM_READ(YM2151_status_port_0_r)
-	AM_RANGE(0x5000, 0x6fff) AM_READ(C140_r)
+	AM_RANGE(0x4000, 0x4001) AM_READ(ym2151_status_port_0_r)
+	AM_RANGE(0x5000, 0x6fff) AM_READ(c140_r)
 	AM_RANGE(0x7000, 0x77ff) AM_READ(namcos2_dpram_byte_r)
 	AM_RANGE(0x7800, 0x7fff) AM_READ(namcos2_dpram_byte_r) /* mirror */
 	AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM)
@@ -718,9 +718,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0x5000, 0x6fff) AM_WRITE(C140_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0x5000, 0x6fff) AM_WRITE(c140_w)
 	AM_RANGE(0x7000, 0x77ff) AM_WRITE(namcos2_dpram_byte_w) AM_BASE(&namcos2_dpram)
 	AM_RANGE(0x7800, 0x7fff) AM_WRITE(namcos2_dpram_byte_w)	/* mirror */
 	AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM)
diff --git a/src/mame/drivers/namcos21.c b/src/mame/drivers/namcos21.c
index be685528421..37bebe77aac 100644
--- a/src/mame/drivers/namcos21.c
+++ b/src/mame/drivers/namcos21.c
@@ -1398,8 +1398,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(BANKED_SOUND_ROM_R) /* banked */
-	AM_RANGE(0x4000, 0x4001) AM_READ(YM2151_status_port_0_r)
-	AM_RANGE(0x5000, 0x6fff) AM_READ(C140_r)
+	AM_RANGE(0x4000, 0x4001) AM_READ(ym2151_status_port_0_r)
+	AM_RANGE(0x5000, 0x6fff) AM_READ(c140_r)
 	AM_RANGE(0x7000, 0x77ff) AM_READ(namcos2_dualportram_byte_r)
 	AM_RANGE(0x7800, 0x7fff) AM_READ(namcos2_dualportram_byte_r)	/* mirror */
 	AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM)
@@ -1409,9 +1409,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x3000, 0x3003) AM_WRITE(SMH_NOP) /* ? */
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0x5000, 0x6fff) AM_WRITE(C140_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0x5000, 0x6fff) AM_WRITE(c140_w)
 	AM_RANGE(0x7000, 0x77ff) AM_WRITE(namcos2_dualportram_byte_w) AM_BASE(&mpDualPortRAM)
 	AM_RANGE(0x7800, 0x7fff) AM_WRITE(namcos2_dualportram_byte_w) /* mirror */
 	AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM)
diff --git a/src/mame/drivers/namcos86.c b/src/mame/drivers/namcos86.c
index 5ab71b52b98..3980722ae1f 100644
--- a/src/mame/drivers/namcos86.c
+++ b/src/mame/drivers/namcos86.c
@@ -413,9 +413,9 @@ static ADDRESS_MAP_START( NAME##_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )					\
 	AM_RANGE(0x0080, 0x00ff) AM_RAM														\
 	AM_RANGE(0x1000, 0x13ff) AM_READWRITE(namcos1_cus30_r,namcos1_cus30_w) /* PSG device, shared RAM */	\
 	AM_RANGE(0x1400, 0x1fff) AM_RAM														\
-	AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x01) AM_READ(YM2151_status_port_0_r)			\
-	AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x00) AM_WRITE(YM2151_register_port_0_w)		\
-	AM_RANGE(ADDR_INPUT+0x01, ADDR_INPUT+0x01) AM_WRITE(YM2151_data_port_0_w)			\
+	AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x01) AM_READ(ym2151_status_port_0_r)			\
+	AM_RANGE(ADDR_INPUT+0x00, ADDR_INPUT+0x00) AM_WRITE(ym2151_register_port_0_w)		\
+	AM_RANGE(ADDR_INPUT+0x01, ADDR_INPUT+0x01) AM_WRITE(ym2151_data_port_0_w)			\
 	AM_RANGE(ADDR_INPUT+0x20, ADDR_INPUT+0x20) AM_READ(input_port_0_r)					\
 	AM_RANGE(ADDR_INPUT+0x21, ADDR_INPUT+0x21) AM_READ(input_port_1_r)					\
 	AM_RANGE(ADDR_INPUT+0x30, ADDR_INPUT+0x30) AM_READ(dsw0_r)							\
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index 4146b863a83..80cd0df736b 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -832,7 +832,7 @@ static const aica_interface aica_config =
 static MACHINE_RESET( naomi )
 {
 	MACHINE_RESET_CALL(dc);
-	AICA_set_ram_base(0, dc_sound_ram, 8*1024*1024);
+	aica_set_ram_base(0, dc_sound_ram, 8*1024*1024);
 }
 
 static MACHINE_DRIVER_START( naomi )
diff --git a/src/mame/drivers/naughtyb.c b/src/mame/drivers/naughtyb.c
index 60db253f761..cf68b504dab 100644
--- a/src/mame/drivers/naughtyb.c
+++ b/src/mame/drivers/naughtyb.c
@@ -361,7 +361,7 @@ static const custom_sound_interface popflame_custom_interface =
 	popflame_sh_start
 };
 
-static const struct TMS36XXinterface tms3615_interface =
+static const tms36xx_interface tms3615_interface =
 {
 	TMS3615,	/* TMS36xx subtype */
 	/*
diff --git a/src/mame/drivers/nbmj8688.c b/src/mame/drivers/nbmj8688.c
index d08965bcd67..96696b8f75c 100644
--- a/src/mame/drivers/nbmj8688.c
+++ b/src/mame/drivers/nbmj8688.c
@@ -37,9 +37,9 @@ TODO:
 
 #define SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
+#define DAC_0_WRITE	dac_0_data_w
 #endif
 
 
@@ -343,7 +343,7 @@ static READ8_HANDLER( ff_r )
 static ADDRESS_MAP_START( readport_secolove, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -355,8 +355,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport_secolove, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -369,8 +369,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport_crystalg, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(nb1413m3_nmi_clock_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -384,7 +384,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_otonano, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x80, 0x80) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0x80, 0x80) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -399,8 +399,8 @@ static ADDRESS_MAP_START( writeport_otonano, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
 	AM_RANGE(0x70, 0x77) AM_WRITE(nbmj8688_blitter_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE)
@@ -412,7 +412,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_kaguya, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -427,8 +427,8 @@ static ADDRESS_MAP_START( writeport_kaguya, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
 	AM_RANGE(0x70, 0x77) AM_WRITE(nbmj8688_blitter_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE)
@@ -444,8 +444,8 @@ static ADDRESS_MAP_START( writeport_iemoto, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x10, 0x10) AM_WRITE(nb1413m3_sndrombank2_w)
 	AM_RANGE(0x40, 0x47) AM_WRITE(nbmj8688_blitter_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(seiha_romsel_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE)
@@ -460,8 +460,8 @@ static ADDRESS_MAP_START( writeport_seiha, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x10, 0x10) AM_WRITE(nb1413m3_sndrombank2_w)
 	AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(seiha_romsel_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -480,8 +480,8 @@ static ADDRESS_MAP_START( writeport_p16bit_LCD, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x45, 0x45) AM_WRITE(nbmj8688_HD61830B_1_instr_w)
 	AM_RANGE(0x46, 0x46) AM_WRITE(nbmj8688_HD61830B_both_data_w)
 	AM_RANGE(0x47, 0x47) AM_WRITE(nbmj8688_HD61830B_both_instr_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(nbmj8688_blitter_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -510,8 +510,8 @@ static ADDRESS_MAP_START( writeport_mjsikaku, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
 	AM_RANGE(0x60, 0x67) AM_WRITE(nbmj8688_blitter_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE)
@@ -523,7 +523,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_mmsikaku, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -539,8 +539,8 @@ static ADDRESS_MAP_START( writeport_mmsikaku, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x3f) AM_WRITE(nbmj8688_clut_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(mjsikaku_romsel_w)
 	AM_RANGE(0x40, 0x47) AM_WRITE(nbmj8688_blitter_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(DAC_0_WRITE)
diff --git a/src/mame/drivers/nbmj8891.c b/src/mame/drivers/nbmj8891.c
index b65d3d705d2..73f4f030665 100644
--- a/src/mame/drivers/nbmj8891.c
+++ b/src/mame/drivers/nbmj8891.c
@@ -52,9 +52,9 @@ TODO:
 
 #define SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
+#define DAC_0_WRITE	dac_0_data_w
 #endif
 
 
@@ -526,8 +526,8 @@ static ADDRESS_MAP_START( writeport_gionbana, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 //  AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP)
@@ -543,8 +543,8 @@ static ADDRESS_MAP_START( writeport_mgion, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 //  AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP)
@@ -556,7 +556,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_omotesnd, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -575,8 +575,8 @@ static ADDRESS_MAP_START( writeport_omotesnd, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x4f) AM_WRITE(nbmj8891_clut_w)
 //  AM_RANGE(0x50, 0x50) AM_WRITE(nb1413m3_nmi_clock_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -592,8 +592,8 @@ static ADDRESS_MAP_START( writeport_hanamomo, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x40) AM_WRITE(nbmj8891_clutsel_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 //  AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP)
@@ -609,8 +609,8 @@ static ADDRESS_MAP_START( writeport_msjiken, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 //  AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP)
@@ -626,8 +626,8 @@ static ADDRESS_MAP_START( writeport_scandal, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -639,7 +639,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_scandalm, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -655,8 +655,8 @@ static ADDRESS_MAP_START( writeport_scandalm, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x10, 0x10) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -673,8 +673,8 @@ static ADDRESS_MAP_START( writeport_bananadr, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_WRITE(nbmj8891_clutsel_w)
 	AM_RANGE(0x30, 0x30) AM_WRITE(nbmj8891_vramsel_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -701,8 +701,8 @@ static ADDRESS_MAP_START( writeport_lovehous, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 //  AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
@@ -729,8 +729,8 @@ static ADDRESS_MAP_START( writeport_maiko, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x50, 0x57) AM_WRITE(nbmj8891_blitter_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(nbmj8891_romsel_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(nbmj8891_scrolly_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 //  AM_RANGE(0xc0, 0xc0) AM_WRITE(SMH_NOP)
@@ -742,7 +742,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_taiwanmb, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -755,8 +755,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport_taiwanmb, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 //  AM_RANGE(0x90, 0x90) AM_WRITE(SMH_NOP)                     // ?
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
diff --git a/src/mame/drivers/nbmj8991.c b/src/mame/drivers/nbmj8991.c
index 2fb11dfa2ac..0ed7943f4aa 100644
--- a/src/mame/drivers/nbmj8991.c
+++ b/src/mame/drivers/nbmj8991.c
@@ -38,11 +38,11 @@ Notes:
 
 #define SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
-#define DAC_1_WRITE	DAC_1_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
+#define DAC_1_WRITE	dac_1_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
-#define DAC_1_WRITE	DAC_1_data_w
+#define DAC_0_WRITE	dac_0_data_w
+#define DAC_1_WRITE	dac_1_data_w
 #endif
 
 
@@ -342,8 +342,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport_galkoku, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -355,7 +355,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_hyouban, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -367,8 +367,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport_hyouban, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_WRITE(nbmj8991_blitter_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(nb1413m3_sndrombank1_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(nb1413m3_nmi_clock_w)
@@ -434,8 +434,8 @@ static ADDRESS_MAP_START( sound_writeport_nbmj8991, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x02, 0x02) AM_WRITE(DAC_1_WRITE)
 	AM_RANGE(0x04, 0x04) AM_WRITE(nbmj8991_soundbank_w)
 	AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/nbmj9195.c b/src/mame/drivers/nbmj9195.c
index 5d5e02c4b95..03a8f02a1b3 100644
--- a/src/mame/drivers/nbmj9195.c
+++ b/src/mame/drivers/nbmj9195.c
@@ -29,11 +29,11 @@ Notes:
 
 #define SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
-#define DAC_1_WRITE	DAC_1_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
+#define DAC_1_WRITE	dac_1_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
-#define DAC_1_WRITE	DAC_1_data_w
+#define DAC_0_WRITE	dac_0_data_w
+#define DAC_1_WRITE	dac_1_data_w
 #endif
 
 
@@ -1749,8 +1749,8 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x34, 0x34) AM_WRITE(tmpz84c011_1_dir_pd_w)
 	AM_RANGE(0x44, 0x44) AM_WRITE(tmpz84c011_1_dir_pe_w)
 
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index e194d470d9d..36095b79e31 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -319,16 +319,16 @@ ADDRESS_MAP_END
 
 static WRITE8_HANDLER( salamand_speech_start_w )
 {
-        VLM5030_ST ( 1 );
-        VLM5030_ST ( 0 );
+        vlm5030_st ( 1 );
+        vlm5030_st ( 0 );
 }
 
 static WRITE8_HANDLER( gx400_speech_start_w )
 {
 	/* the voice data is not in a rom but in sound RAM at $8000 */
-	VLM5030_set_rom (gx400_shared_ram + 0x4000);
-	VLM5030_ST (1);
-	VLM5030_ST (0);
+	vlm5030_set_rom (gx400_shared_ram + 0x4000);
+	vlm5030_st (1);
+	vlm5030_st (0);
 }
 
 static READ8_HANDLER( nemesis_portA_r )
@@ -344,7 +344,7 @@ static READ8_HANDLER( nemesis_portA_r )
 
 	res |= 0xd0;
 
-	if (sndti_exists(SOUND_VLM5030, 0) && VLM5030_BSY())
+	if (sndti_exists(SOUND_VLM5030, 0) && vlm5030_bsy())
 		res |= 0x20;
 
 	return res;
@@ -354,8 +354,8 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_r)
-	AM_RANGE(0xe086, 0xe086) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xe205, 0xe205) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0xe086, 0xe086) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xe205, 0xe205) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -365,10 +365,10 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xcfff) AM_WRITE(k005289_pitch_B_w)
 	AM_RANGE(0xe003, 0xe003) AM_WRITE(k005289_keylatch_A_w)
 	AM_RANGE(0xe004, 0xe004) AM_WRITE(k005289_keylatch_B_w)
-	AM_RANGE(0xe005, 0xe005) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xe006, 0xe006) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xe106, 0xe106) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xe405, 0xe405) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xe005, 0xe005) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xe006, 0xe006) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xe106, 0xe106) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xe405, 0xe405) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( konamigt_readmem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -540,8 +540,8 @@ static ADDRESS_MAP_START( gx400_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x87ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xe001, 0xe001) AM_READ(soundlatch_r)
-	AM_RANGE(0xe086, 0xe086) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xe205, 0xe205) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0xe086, 0xe086) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xe205, 0xe205) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gx400_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -549,14 +549,14 @@ static ADDRESS_MAP_START( gx400_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x87ff) AM_WRITE(SMH_RAM) AM_BASE(&gx400_shared_ram)
 	AM_RANGE(0xa000, 0xafff) AM_WRITE(k005289_pitch_A_w)
 	AM_RANGE(0xc000, 0xcfff) AM_WRITE(k005289_pitch_B_w)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(VLM5030_data_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(vlm5030_data_w)
 	AM_RANGE(0xe003, 0xe003) AM_WRITE(k005289_keylatch_A_w)
 	AM_RANGE(0xe004, 0xe004) AM_WRITE(k005289_keylatch_B_w)
-	AM_RANGE(0xe005, 0xe005) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xe006, 0xe006) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xe005, 0xe005) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xe006, 0xe006) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xe030, 0xe030) AM_WRITE(gx400_speech_start_w)
-	AM_RANGE(0xe106, 0xe106) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xe405, 0xe405) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xe106, 0xe106) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xe405, 0xe405) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 /******************************************************************************/
@@ -761,7 +761,7 @@ static ADDRESS_MAP_START( sal_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xe000, 0xe000) AM_READ(wd_r) /* watchdog?? */
 ADDRESS_MAP_END
 
@@ -769,16 +769,16 @@ static ADDRESS_MAP_START( sal_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(VLM5030_data_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(vlm5030_data_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(salamand_speech_start_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( city_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)
 	AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -790,8 +790,8 @@ static ADDRESS_MAP_START( city_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9880, 0x9889) AM_WRITE(k051649_frequency_w)
 	AM_RANGE(0x988a, 0x988e) AM_WRITE(k051649_volume_w)
 	AM_RANGE(0x988f, 0x988f) AM_WRITE(k051649_keyonoff_w)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(city_sound_bank_w) /* 7232 bankswitch */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/neogeo.c b/src/mame/drivers/neogeo.c
index 34546520e08..300bbf2cc38 100644
--- a/src/mame/drivers/neogeo.c
+++ b/src/mame/drivers/neogeo.c
@@ -1088,10 +1088,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( auido_io_map, ADDRESS_SPACE_IO, 8 )
   /*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/  /* may not and NMI clear */
 	AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r)
-	AM_RANGE(0x04, 0x04) AM_MIRROR(0xff00) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0x05, 0x05) AM_MIRROR(0xff00) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w)
-	AM_RANGE(0x06, 0x06) AM_MIRROR(0xff00) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0x07, 0x07) AM_MIRROR(0xff00) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x04, 0x04) AM_MIRROR(0xff00) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0x05, 0x05) AM_MIRROR(0xff00) AM_READWRITE(ym2610_read_port_0_r, ym2610_data_port_0_a_w)
+	AM_RANGE(0x06, 0x06) AM_MIRROR(0xff00) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0x07, 0x07) AM_MIRROR(0xff00) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) /* write - NMI enable / acknowledge? (the data written doesn't matter) */
 	AM_RANGE(0x08, 0x08) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_f000_f7ff_r)
 	AM_RANGE(0x09, 0x09) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_e000_efff_r)
diff --git a/src/mame/drivers/ninjakd2.c b/src/mame/drivers/ninjakd2.c
index bc4641ba8ec..4178b643919 100644
--- a/src/mame/drivers/ninjakd2.c
+++ b/src/mame/drivers/ninjakd2.c
@@ -471,10 +471,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ninjakd2_sound_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/ninjaw.c b/src/mame/drivers/ninjaw.c
index b6b39f6e640..b4f738ca4e6 100644
--- a/src/mame/drivers/ninjaw.c
+++ b/src/mame/drivers/ninjaw.c
@@ -408,9 +408,9 @@ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -419,10 +419,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(ninjaw_pancontrol) /* pan */
diff --git a/src/mame/drivers/niyanpai.c b/src/mame/drivers/niyanpai.c
index e19403fac98..0769ce254b2 100644
--- a/src/mame/drivers/niyanpai.c
+++ b/src/mame/drivers/niyanpai.c
@@ -43,11 +43,11 @@ Memo:
 
 #define SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
-#define DAC_1_WRITE	DAC_1_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
+#define DAC_1_WRITE	dac_1_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
-#define DAC_1_WRITE	DAC_1_data_w
+#define DAC_0_WRITE	dac_0_data_w
+#define DAC_1_WRITE	dac_1_data_w
 #endif
 
 
@@ -532,8 +532,8 @@ static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x56, 0x56) AM_WRITE(tmpz84c011_0_dir_pc_w)
 	AM_RANGE(0x34, 0x34) AM_WRITE(tmpz84c011_0_dir_pd_w)
 	AM_RANGE(0x44, 0x44) AM_WRITE(tmpz84c011_0_dir_pe_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/nmg5.c b/src/mame/drivers/nmg5.c
index 25cc7ee4eb2..569a5435f56 100644
--- a/src/mame/drivers/nmg5.c
+++ b/src/mame/drivers/nmg5.c
@@ -345,8 +345,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(oki_banking_w)
-	AM_RANGE(0x10, 0x10) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x11, 0x11) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x11, 0x11) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r)
 	AM_RANGE(0x1c, 0x1c) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 38ff6250587..3357ed304af 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -455,14 +455,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tharrier_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2203_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tharrier_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tharrier_readmem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -1068,8 +1068,8 @@ static WRITE8_HANDLER( raphero_sound_rombank_w )
 static ADDRESS_MAP_START( raphero_sound_mem_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE( 0x0000, 0x7fff ) AM_ROM
 	AM_RANGE( 0x8000, 0xbfff ) AM_READ( SMH_BANK1 )
-	AM_RANGE( 0xc000, 0xc000 ) AM_READWRITE( YM2203_status_port_0_r, YM2203_control_port_0_w )
-	AM_RANGE( 0xc001, 0xc001 ) AM_READWRITE( YM2203_read_port_0_r, YM2203_write_port_0_w )
+	AM_RANGE( 0xc000, 0xc000 ) AM_READWRITE( ym2203_status_port_0_r, ym2203_control_port_0_w )
+	AM_RANGE( 0xc001, 0xc001 ) AM_READWRITE( ym2203_read_port_0_r, ym2203_write_port_0_w )
 	AM_RANGE( 0xc800, 0xc800 ) AM_READWRITE( okim6295_status_0_r, okim6295_data_0_w )
 	AM_RANGE( 0xc808, 0xc808 ) AM_READWRITE( okim6295_status_1_r, okim6295_data_1_w )
 	AM_RANGE( 0xc810, 0xc817 ) AM_WRITE( NMK112_okibank_w )
@@ -1096,16 +1096,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( macross2_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0x80, 0x80) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x88, 0x88) AM_READ(okim6295_status_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( macross2_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x88, 0x88) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(NMK112_okibank_w)
@@ -4720,8 +4720,8 @@ static ADDRESS_MAP_START( afega_sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM									// RAM
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)					// From Main CPU
-	AM_RANGE(0xf808, 0xf808) AM_WRITE(YM2151_register_port_0_w)		// YM2151
-	AM_RANGE(0xf809, 0xf809) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)	// YM2151
+	AM_RANGE(0xf808, 0xf808) AM_WRITE(ym2151_register_port_0_w)		// YM2151
+	AM_RANGE(0xf809, 0xf809) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)	// YM2151
 	AM_RANGE(0xf80a, 0xf80a) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)		// M6295
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/nova2001.c b/src/mame/drivers/nova2001.c
index 112337e4982..6b09876c9b4 100644
--- a/src/mame/drivers/nova2001.c
+++ b/src/mame/drivers/nova2001.c
@@ -178,10 +178,10 @@ static ADDRESS_MAP_START( nova2001_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xa800, 0xafff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE(&nova2001_bg_videoram)
 	AM_RANGE(0xb000, 0xb7ff) AM_RAM AM_BASE(&spriteram)
 	AM_RANGE(0xb800, 0xbfff) AM_WRITE(nova2001_flipscreen_w)
-	AM_RANGE(0xc000, 0xc000) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0xc002, 0xc002) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc003, 0xc003) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0xc000, 0xc000) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0xc002, 0xc002) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc003, 0xc003) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xc004, 0xc004) AM_READ(watchdog_reset_r)
 	AM_RANGE(0xc006, 0xc006) AM_READ(input_port_0_r)
 	AM_RANGE(0xc007, 0xc007) AM_READ(input_port_1_r)
@@ -193,10 +193,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ninjakun_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x7fff) AM_ROM
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r)
 	AM_RANGE(0xa002, 0xa002) AM_READWRITE(ninjakun_io_A002_r, ninjakun_cpu1_io_A002_w)
@@ -212,10 +212,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ninjakun_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x7fff) AM_ROM AM_REGION("main", 0x2000)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r)
 	AM_RANGE(0xa002, 0xa002) AM_READWRITE(ninjakun_io_A002_r, ninjakun_cpu2_io_A002_w)
@@ -233,10 +233,10 @@ static ADDRESS_MAP_START( pkunwar_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&spriteram)
 	AM_RANGE(0x8800, 0x8fff) AM_RAM_WRITE(nova2001_bg_videoram_w) AM_BASE(&nova2001_bg_videoram)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(&AY8910_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0xa002, 0xa002) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xa003, 0xa003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(&ay8910_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0xa002, 0xa002) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xa003, 0xa003) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xe000, 0xffff) AM_ROM
 ADDRESS_MAP_END
@@ -255,20 +255,20 @@ static ADDRESS_MAP_START( raiders5_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(nova2001_scroll_x_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(nova2001_scroll_y_w)
 	AM_RANGE(0xa002, 0xa002) AM_WRITE(pkunwar_flipscreen_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0xc002, 0xc002) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xc003, 0xc003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0xc002, 0xc002) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xc003, 0xc003) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0xd000, 0xd1ff) AM_RAM_WRITE(ninjakun_paletteram_w) AM_BASE(&paletteram)
 	AM_RANGE(0xe000, 0xe7ff) AM_RAM AM_SHARE(1)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( raiders5_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0x9000, 0x9000) AM_READ(SMH_NOP) /* unknown */
 	AM_RANGE(0xa000, 0xa7ff) AM_RAM AM_SHARE(1)
 	AM_RANGE(0xc000, 0xc000) AM_READ(SMH_NOP) /* unknown */
diff --git a/src/mame/drivers/nycaptor.c b/src/mame/drivers/nycaptor.c
index a30d9c06a8c..d90066e2029 100644
--- a/src/mame/drivers/nycaptor.c
+++ b/src/mame/drivers/nycaptor.c
@@ -368,10 +368,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xc802, 0xc802) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xc803, 0xc803) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xc802, 0xc802) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xc803, 0xc803) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xc900, 0xc90d) AM_WRITE(msm5232_0_w)
 	AM_RANGE(0xca00, 0xca00) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xcb00, 0xcb00) AM_WRITE(SMH_NOP)
diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c
index b0eba6597c0..d1f696ecfa8 100644
--- a/src/mame/drivers/nyny.c
+++ b/src/mame/drivers/nyny.c
@@ -455,7 +455,7 @@ static WRITE8_HANDLER( nyny_ay8910_37_port_a_w )
 
 static WRITE8_HANDLER( nyny_ay8910_37_port_b_w )
 {
-	DAC_data_w(0, data);
+	dac_data_w(0, data);
 }
 
 
@@ -546,10 +546,10 @@ static ADDRESS_MAP_START( nyny_audio_1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0080, 0x0fff) AM_NOP
 	AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_READWRITE(soundlatch_r, audio_1_answer_w)
 	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0fff) AM_READ_PORT("SW3")
-	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0ffc) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x3001, 0x3001) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x3002, 0x3002) AM_MIRROR(0x0ffc) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x3003, 0x3003) AM_MIRROR(0x0ffc) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x3000, 0x3000) AM_MIRROR(0x0ffc) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x3001, 0x3001) AM_MIRROR(0x0ffc) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x3002, 0x3002) AM_MIRROR(0x0ffc) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x3003, 0x3003) AM_MIRROR(0x0ffc) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x4000, 0x4fff) AM_NOP
 	AM_RANGE(0x5000, 0x57ff) AM_MIRROR(0x0800) AM_ROM
 	AM_RANGE(0x6000, 0x67ff) AM_MIRROR(0x0800) AM_ROM
@@ -562,8 +562,8 @@ static ADDRESS_MAP_START( nyny_audio_2_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x007f) AM_RAM		/* internal RAM */
 	AM_RANGE(0x0080, 0x0fff) AM_NOP
 	AM_RANGE(0x1000, 0x1000) AM_MIRROR(0x0fff) AM_READ(soundlatch2_r)
-	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffe) AM_READWRITE(AY8910_read_port_2_r, AY8910_write_port_2_w)
-	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x0ffe) AM_WRITE(AY8910_control_port_2_w)
+	AM_RANGE(0x2000, 0x2000) AM_MIRROR(0x0ffe) AM_READWRITE(ay8910_read_port_2_r, ay8910_write_port_2_w)
+	AM_RANGE(0x2001, 0x2001) AM_MIRROR(0x0ffe) AM_WRITE(ay8910_control_port_2_w)
 	AM_RANGE(0x3000, 0x6fff) AM_NOP
 	AM_RANGE(0x7000, 0x77ff) AM_MIRROR(0x0800) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ojankohs.c b/src/mame/drivers/ojankohs.c
index f3d7676a7fc..df5798cfff5 100644
--- a/src/mame/drivers/ojankohs.c
+++ b/src/mame/drivers/ojankohs.c
@@ -285,7 +285,7 @@ static ADDRESS_MAP_START( readport_ojankohs, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
 	AM_RANGE(0x01, 0x01) AM_READ(ojankohs_keymatrix_r)
 	AM_RANGE(0x02, 0x02) AM_READ(input_port_1_r)
-	AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x06, 0x06) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport_ojankohs, ADDRESS_SPACE_IO, 8 )
@@ -296,8 +296,8 @@ static ADDRESS_MAP_START( writeport_ojankohs, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x03, 0x03) AM_WRITE(ojankohs_adpcm_reset_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP)				// unknown
 	AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP)				// unknown
 ADDRESS_MAP_END
@@ -309,8 +309,8 @@ static ADDRESS_MAP_START( writeport_ojankoy, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x02, 0x02) AM_WRITE(ojankoy_coinctr_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readport_ccasino, ADDRESS_SPACE_IO, 8 )
@@ -320,7 +320,7 @@ static ADDRESS_MAP_START( readport_ccasino, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x02, 0x02) AM_READ(input_port_1_r)
 	AM_RANGE(0x03, 0x03) AM_READ(ccasino_dipsw3_r)
 	AM_RANGE(0x04, 0x04) AM_READ(ccasino_dipsw4_r)
-	AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x06, 0x06) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport_ccasino, ADDRESS_SPACE_IO, 8 )
@@ -331,8 +331,8 @@ static ADDRESS_MAP_START( writeport_ccasino, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x03, 0x03) AM_WRITE(ojankohs_adpcm_reset_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(ojankohs_flipscreen_w)
 	AM_RANGE(0x05, 0x05) AM_WRITE(ojankohs_msm5205_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x08, 0x0f) AM_WRITE(ccasino_palette_w)		// 16bit address access
 	AM_RANGE(0x10, 0x10) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x11, 0x11) AM_WRITE(SMH_NOP)
@@ -341,7 +341,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_ojankoc, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0xfc, 0xfd) AM_READ(ojankoc_keymatrix_r)
-	AM_RANGE(0xff, 0xff) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xff, 0xff) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport_ojankoc, ADDRESS_SPACE_IO, 8 )
@@ -350,8 +350,8 @@ static ADDRESS_MAP_START( writeport_ojankoc, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0xf9, 0xf9) AM_WRITE(ojankohs_msm5205_w)
 	AM_RANGE(0xfb, 0xfb) AM_WRITE(ojankoc_ctrl_w)
 	AM_RANGE(0xfd, 0xfd) AM_WRITE(ojankohs_portselect_w)
-	AM_RANGE(0xfe, 0xfe) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xff, 0xff) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xfe, 0xfe) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xff, 0xff) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( mahjong_p1 )
diff --git a/src/mame/drivers/olibochu.c b/src/mame/drivers/olibochu.c
index ef87fb7f780..e9a4e41df4d 100644
--- a/src/mame/drivers/olibochu.c
+++ b/src/mame/drivers/olibochu.c
@@ -209,8 +209,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x6000, 0x63ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x7000, 0x7000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x7001, 0x7001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x7000, 0x7000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x7001, 0x7001) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/omegrace.c b/src/mame/drivers/omegrace.c
index 267b015ac6a..c92f32a8cd9 100644
--- a/src/mame/drivers/omegrace.c
+++ b/src/mame/drivers/omegrace.c
@@ -373,10 +373,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(soundlatch_r, ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/oneshot.c b/src/mame/drivers/oneshot.c
index 7e48c7318fb..d4e1940e441 100644
--- a/src/mame/drivers/oneshot.c
+++ b/src/mame/drivers/oneshot.c
@@ -147,7 +147,7 @@ static ADDRESS_MAP_START( snd_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x8000) AM_READ(soundlatch_r)
 	AM_RANGE(0x8001, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0xe010, 0xe010) AM_READ(okim6295_status_0_r)
 ADDRESS_MAP_END
 
@@ -155,8 +155,8 @@ static ADDRESS_MAP_START( snd_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8000) AM_WRITE(soundlatch_w)
 	AM_RANGE(0x8001, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xe010, 0xe010) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/onetwo.c b/src/mame/drivers/onetwo.c
index d076a9ba73e..e8e2b390709 100644
--- a/src/mame/drivers/onetwo.c
+++ b/src/mame/drivers/onetwo.c
@@ -133,8 +133,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_cpu_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/opwolf.c b/src/mame/drivers/opwolf.c
index c840a87b61f..a3a96ce58cc 100644
--- a/src/mame/drivers/opwolf.c
+++ b/src/mame/drivers/opwolf.c
@@ -285,7 +285,7 @@ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x9001, 0x9001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -394,8 +394,8 @@ static WRITE8_HANDLER( opwolf_adpcm_e_w )
 static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xb000, 0xb006) AM_WRITE(opwolf_adpcm_b_w)
diff --git a/src/mame/drivers/othunder.c b/src/mame/drivers/othunder.c
index 9e26c3298c2..1091438071b 100644
--- a/src/mame/drivers/othunder.c
+++ b/src/mame/drivers/othunder.c
@@ -529,10 +529,10 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(10)
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2610_read_port_0_r, ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(othunder_TC0310FAM_w) /* pan */
diff --git a/src/mame/drivers/overdriv.c b/src/mame/drivers/overdriv.c
index 9454bf3d223..b8ea3a1f010 100644
--- a/src/mame/drivers/overdriv.c
+++ b/src/mame/drivers/overdriv.c
@@ -323,7 +323,7 @@ ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( overdriv_s_readmem, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x0201, 0x0201) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x0201, 0x0201) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x0400, 0x042f) AM_READ(k053260_0_r)
 	AM_RANGE(0x0600, 0x062f) AM_READ(k053260_1_r)
 	AM_RANGE(0x0800, 0x0fff) AM_READ(SMH_RAM)
@@ -331,8 +331,8 @@ static ADDRESS_MAP_START( overdriv_s_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( overdriv_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x0200, 0x0200) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x0201, 0x0201) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x0200, 0x0200) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x0201, 0x0201) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x0400, 0x042f) AM_WRITE(k053260_0_w)
 	AM_RANGE(0x0600, 0x062f) AM_WRITE(k053260_1_w)
 	AM_RANGE(0x0800, 0x0fff) AM_WRITE(SMH_RAM)
diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c
index 66d58b661ef..512149d4895 100644
--- a/src/mame/drivers/pacman.c
+++ b/src/mame/drivers/pacman.c
@@ -1139,8 +1139,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( dremshpr_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x07, 0x07) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( piranha_writeport, ADDRESS_SPACE_IO, 8 )
@@ -1202,8 +1202,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( crushs_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/pandoras.c b/src/mame/drivers/pandoras.c
index dd89b5fd912..d39584cbf34 100644
--- a/src/mame/drivers/pandoras.c
+++ b/src/mame/drivers/pandoras.c
@@ -166,14 +166,14 @@ static ADDRESS_MAP_START( pandoras_readmem_snd, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM)				/* ROM */
 	AM_RANGE(0x2000, 0x23ff) AM_READ(SMH_RAM)				/* RAM */
 	AM_RANGE(0x4000, 0x4000) AM_READ(soundlatch_r)			/* soundlatch_r */
-	AM_RANGE(0x6001, 0x6001) AM_READ(AY8910_read_port_0_r)	/* AY-8910 */
+	AM_RANGE(0x6001, 0x6001) AM_READ(ay8910_read_port_0_r)	/* AY-8910 */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pandoras_writemem_snd, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)				/* ROM */
 	AM_RANGE(0x2000, 0x23ff) AM_WRITE(SMH_RAM)				/* RAM */
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_0_w)/* AY-8910 */
-	AM_RANGE(0x6002, 0x6002) AM_WRITE(AY8910_write_port_0_w)	/* AY-8910 */
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_0_w)/* AY-8910 */
+	AM_RANGE(0x6002, 0x6002) AM_WRITE(ay8910_write_port_0_w)	/* AY-8910 */
 	AM_RANGE(0x8000, 0x8000) AM_WRITE(pandoras_i8039_irqtrigger_w)/* cause INT on the 8039 */
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(soundlatch2_w)			/* sound command to the 8039 */
 ADDRESS_MAP_END
@@ -191,7 +191,7 @@ static ADDRESS_MAP_START( i8039_readport, ADDRESS_SPACE_IO, 8 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( i8039_writeport, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2) AM_WRITE(i8039_irqen_and_status_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/paranoia.c b/src/mame/drivers/paranoia.c
index 4cfc30c02c2..bc6f67ce278 100644
--- a/src/mame/drivers/paranoia.c
+++ b/src/mame/drivers/paranoia.c
@@ -57,7 +57,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
 	AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram )
 	AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w )
 	AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w )
-	AM_RANGE( 0x1FE800, 0x1FEBFF) AM_READWRITE( C6280_r, C6280_0_w )
+	AM_RANGE( 0x1FE800, 0x1FEBFF) AM_READWRITE( c6280_r, c6280_0_w )
 	AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( H6280_timer_r, H6280_timer_w )
 	AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w )
 	AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( H6280_irq_status_r, H6280_irq_status_w )
diff --git a/src/mame/drivers/parodius.c b/src/mame/drivers/parodius.c
index 98acf3e58ef..0b9bc893efb 100644
--- a/src/mame/drivers/parodius.c
+++ b/src/mame/drivers/parodius.c
@@ -163,15 +163,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( parodius_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xf801, 0xf801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xfc00, 0xfc2f) AM_READ(k053260_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( parodius_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w)
 	AM_RANGE(0xfc00, 0xfc2f) AM_WRITE(k053260_0_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/pass.c b/src/mame/drivers/pass.c
index 97f904a8df4..02410046500 100644
--- a/src/mame/drivers/pass.c
+++ b/src/mame/drivers/pass.c
@@ -155,14 +155,14 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( pass_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_READ(soundlatch_r)
-	AM_RANGE(0x70, 0x70) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0x71, 0x71) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0x70, 0x70) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0x71, 0x71) AM_READ(ym2203_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pass_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x70, 0x70) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x71, 0x71) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x70, 0x70) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x71, 0x71) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(soundlatch_clear_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c
index 89c9f911153..c637fd8bc9a 100644
--- a/src/mame/drivers/pastelg.c
+++ b/src/mame/drivers/pastelg.c
@@ -28,9 +28,9 @@ Memo:
 
 #define SIGNED_DAC	0		// 0:unsigned DAC, 1:signed DAC
 #if SIGNED_DAC
-#define DAC_0_WRITE	DAC_0_signed_data_w
+#define DAC_0_WRITE	dac_0_signed_data_w
 #else
-#define DAC_0_WRITE	DAC_0_data_w
+#define DAC_0_WRITE	dac_0_data_w
 #endif
 
 
@@ -71,7 +71,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readport_pastelg, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x7f) AM_READ(nb1413m3_sndrom_r)
-	AM_RANGE(0x81, 0x81) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x81, 0x81) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x90, 0x90) AM_READ(nb1413m3_inputport0_r)
 	AM_RANGE(0xa0, 0xa0) AM_READ(nb1413m3_inputport1_r)
 	AM_RANGE(0xb0, 0xb0) AM_READ(nb1413m3_inputport2_r)
@@ -83,8 +83,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport_pastelg, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 //  AM_RANGE(0x00, 0x00) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x82, 0x82) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x90, 0x96) AM_WRITE(pastelg_blitter_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(nb1413m3_inputportsel_w)
 	AM_RANGE(0xb0, 0xb0) AM_WRITE(pastelg_romsel_w)
diff --git a/src/mame/drivers/pbaction.c b/src/mame/drivers/pbaction.c
index ad77131e8b1..5e0efb12205 100644
--- a/src/mame/drivers/pbaction.c
+++ b/src/mame/drivers/pbaction.c
@@ -107,12 +107,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x11, 0x11) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x21, 0x21) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x30, 0x30) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x31, 0x31) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x11, 0x11) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x21, 0x21) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x30, 0x30) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x31, 0x31) AM_WRITE(ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/pcktgal.c b/src/mame/drivers/pcktgal.c
index a1de0c5cbba..5520d995e00 100644
--- a/src/mame/drivers/pcktgal.c
+++ b/src/mame/drivers/pcktgal.c
@@ -109,10 +109,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(pcktgal_adpcm_data_w)	/* ADPCM data for the MSM5205 chip */
 	AM_RANGE(0x2000, 0x2000) AM_WRITE(pcktgal_sound_bank_w)
 	AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM)
diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c
index 7aac038bc9e..a0c2f8cb235 100644
--- a/src/mame/drivers/peplus.c
+++ b/src/mame/drivers/peplus.c
@@ -719,8 +719,8 @@ static ADDRESS_MAP_START( peplus_datamap, ADDRESS_SPACE_DATA, 8 )
 	AM_RANGE(0x3000, 0x3fff) AM_READWRITE(peplus_s3000_r, peplus_s3000_w) AM_BASE(&s3000_ram)
 
 	// Sound and Dipswitches
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4004, 0x4004) AM_READ_PORT("SW1") AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4004, 0x4004) AM_READ_PORT("SW1") AM_WRITE(ay8910_write_port_0_w)
 
     // Superboard Data
 	AM_RANGE(0x5000, 0x5fff) AM_READWRITE(peplus_s5000_r, peplus_s5000_w) AM_BASE(&s5000_ram)
diff --git a/src/mame/drivers/phoenix.c b/src/mame/drivers/phoenix.c
index 60e66ea202f..bebaadb5e8b 100644
--- a/src/mame/drivers/phoenix.c
+++ b/src/mame/drivers/phoenix.c
@@ -64,8 +64,8 @@ static ADDRESS_MAP_START( survival_memory_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x4fff) AM_READWRITE(SMH_BANK1, phoenix_videoram_w)	/* 2 pages selected by bit 0 of the video register */
 	AM_RANGE(0x5000, 0x53ff) AM_WRITE(phoenix_videoreg_w)
 	AM_RANGE(0x5800, 0x5bff) AM_WRITE(phoenix_scroll_w)
-	AM_RANGE(0x6800, 0x68ff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6900, 0x69ff) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x6800, 0x68ff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6900, 0x69ff) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0x7000, 0x73ff) AM_READ(survival_input_port_0_r)				/* IN0 or IN1 */
 	AM_RANGE(0x7800, 0x7bff) AM_READ_PORT("DSW0") 							/* DSW */
 ADDRESS_MAP_END
@@ -390,7 +390,7 @@ static GFXDECODE_START( pleiads )
 GFXDECODE_END
 
 
-static const struct TMS36XXinterface phoenix_tms36xx_interface =
+static const tms36xx_interface phoenix_tms36xx_interface =
 {
 	MM6221AA,	/* TMS36xx subtype(s) */
 	{0.50,0,0,1.05,0,0}, /* decay times of voices */
@@ -402,7 +402,7 @@ static const custom_sound_interface phoenix_custom_interface =
 	phoenix_sh_start
 };
 
-static const struct TMS36XXinterface pleiads_tms36xx_interface =
+static const tms36xx_interface pleiads_tms36xx_interface =
 {
 	TMS3615,	/* TMS36xx subtype(s) */
 	/*
diff --git a/src/mame/drivers/pipedrm.c b/src/mame/drivers/pipedrm.c
index c654a01ad73..d3814fa6aff 100644
--- a/src/mame/drivers/pipedrm.c
+++ b/src/mame/drivers/pipedrm.c
@@ -265,23 +265,23 @@ static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x04, 0x04) AM_WRITE(sound_bankswitch_w)
 	AM_RANGE(0x16, 0x16) AM_READ(sound_command_r)
 	AM_RANGE(0x17, 0x17) AM_WRITE(pending_command_clear_w)
-	AM_RANGE(0x18, 0x18) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0x19, 0x19) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x1a, 0x1a) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0x1b, 0x1b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x18, 0x18) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0x19, 0x19) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x1a, 0x1a) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0x1b, 0x1b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( hatris_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM2608_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2608_data_port_0_B_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym2608_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2608_data_port_0_b_w)
 	AM_RANGE(0x04, 0x04) AM_READ(sound_command_r)
 	AM_RANGE(0x05, 0x05) AM_READWRITE(pending_command_r, pending_command_clear_w)
-	AM_RANGE(0x08, 0x08) AM_READWRITE(YM2608_status_port_0_A_r, YM2608_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2608_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_READWRITE(YM2608_status_port_0_B_r, YM2608_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2608_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_READWRITE(ym2608_status_port_0_a_r, ym2608_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2608_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_READWRITE(ym2608_status_port_0_b_r, ym2608_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2608_data_port_0_b_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 5bb8981bd5f..51818ab51de 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -129,10 +129,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w)
-	AM_RANGE(0x8c, 0x8c) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8d, 0x8d) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8f, 0x8f) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8c, 0x8c) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8d, 0x8d) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8e, 0x8e) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8f, 0x8f) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x90, 0x96) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x97, 0x97) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x98, 0x98) AM_WRITE(SMH_NOP)
@@ -140,7 +140,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x8f, 0x8f) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x8f, 0x8f) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/pkscram.c b/src/mame/drivers/pkscram.c
index b877e6fe965..31b1d0bae04 100644
--- a/src/mame/drivers/pkscram.c
+++ b/src/mame/drivers/pkscram.c
@@ -48,14 +48,14 @@ static WRITE16_HANDLER( pkscramble_YM2203_w )
 {
 	switch (offset)
 	{
-		case 0: YM2203_control_port_0_w(machine,0,data & 0xff);break;
-		case 1: YM2203_write_port_0_w(machine,0,data & 0xff);break;
+		case 0: ym2203_control_port_0_w(machine,0,data & 0xff);break;
+		case 1: ym2203_write_port_0_w(machine,0,data & 0xff);break;
 	}
 }
 
 static READ16_HANDLER( pkscramble_YM2203_r )
 {
-	return YM2203_status_port_0_r(machine,0);
+	return ym2203_status_port_0_r(machine,0);
 }
 
 // input bit 0x20 in port1 should stay low until bit 0x20 is written here, then
diff --git a/src/mame/drivers/playch10.c b/src/mame/drivers/playch10.c
index b947d44a5f3..0567d25f42b 100644
--- a/src/mame/drivers/playch10.c
+++ b/src/mame/drivers/playch10.c
@@ -407,7 +407,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( cart_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM AM_MIRROR(0x1800) AM_BASE(&work_ram)
 	AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w)
-	AM_RANGE(0x4011, 0x4011) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x4011, 0x4011) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x4000, 0x4013) AM_READWRITE(nes_psg_0_r, nes_psg_0_w)
 	AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_w)
 	AM_RANGE(0x4015, 0x4015) AM_READWRITE(psg_4015_r, psg_4015_w)  /* PSG status / first control register */
diff --git a/src/mame/drivers/pokechmp.c b/src/mame/drivers/pokechmp.c
index fefed2edee9..b821a30ea0b 100644
--- a/src/mame/drivers/pokechmp.c
+++ b/src/mame/drivers/pokechmp.c
@@ -154,10 +154,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x1000, 0x1000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x1001, 0x1001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x1000, 0x1000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x1001, 0x1001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(SMH_NOP)	/* MSM5205 chip on Pocket Gal, not connected here? */
 //  AM_RANGE(0x2000, 0x2000) AM_WRITE(pokechmp_sound_bank_w)/ * might still be sound bank */
 	AM_RANGE(0x2800, 0x2800) AM_WRITE(okim6295_data_0_w) // extra
diff --git a/src/mame/drivers/policetr.c b/src/mame/drivers/policetr.c
index 8a6c7867b76..2817bffb1b9 100644
--- a/src/mame/drivers/policetr.c
+++ b/src/mame/drivers/policetr.c
@@ -188,7 +188,7 @@ static WRITE32_HANDLER( control_w )
 	/* toggling BSMT off then on causes a reset */
 	if (!(old & 0x80000000) && (control_data & 0x80000000))
 	{
-		BSMT2000_data_0_w(machine, bsmt_data_bank, 0, 0xffff);
+		bsmt2000_data_0_w(machine, bsmt_data_bank, 0, 0xffff);
 		sndti_reset(SOUND_BSMT2000, 0);
 	}
 
@@ -208,7 +208,7 @@ static WRITE32_HANDLER( control_w )
 static WRITE32_HANDLER( bsmt2000_reg_w )
 {
 	if (control_data & 0x80000000)
-		BSMT2000_data_0_w(machine, bsmt_reg, data & 0xffff, mem_mask & 0xffff);
+		bsmt2000_data_0_w(machine, bsmt_reg, data & 0xffff, mem_mask & 0xffff);
 	else
 		COMBINE_DATA(&bsmt_data_offset);
 }
diff --git a/src/mame/drivers/popeye.c b/src/mame/drivers/popeye.c
index 9ada283651e..b6cd153abff 100644
--- a/src/mame/drivers/popeye.c
+++ b/src/mame/drivers/popeye.c
@@ -151,13 +151,13 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_READ_PORT("P1")
 	AM_RANGE(0x01, 0x01) AM_READ_PORT("P2")
 	AM_RANGE(0x02, 0x02) AM_READ_PORT("IN0")
-	AM_RANGE(0x03, 0x03) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x03, 0x03) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/popper.c b/src/mame/drivers/popper.c
index 71f8ef24870..ed4414af015 100644
--- a/src/mame/drivers/popper.c
+++ b/src/mame/drivers/popper.c
@@ -198,11 +198,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( popper_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x8002, 0x8002) AM_WRITE(SMH_NOP)					//?? same writes as 0x8000 (mostly)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xa002, 0xa002) AM_WRITE(SMH_NOP)					//?? same writes as 0xa000
 	AM_RANGE(0xd800, 0xdfff) AM_WRITE(popper_sharedram_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/powerins.c b/src/mame/drivers/powerins.c
index e22428d2d96..7bcc9fea03a 100644
--- a/src/mame/drivers/powerins.c
+++ b/src/mame/drivers/powerins.c
@@ -134,8 +134,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( powerins_io_snd, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x88, 0x88) AM_READWRITE(okim6295_status_1_r, okim6295_data_1_w)
 	AM_RANGE(0x90, 0x97) AM_WRITE(NMK112_okibank_w)
diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c
index 64dbb9ce099..a65ce861953 100644
--- a/src/mame/drivers/ppmast93.c
+++ b/src/mame/drivers/ppmast93.c
@@ -190,9 +190,9 @@ static WRITE8_HANDLER(ppmast_sound_w)
 {
 	switch(offset&0xff)
 	{
-		case 0: YM2413_register_port_0_w(machine,0,data); break;
-		case 1: YM2413_data_port_0_w(machine,0,data); break;
-		case 2: DAC_0_data_w(machine,0,data);break;
+		case 0: ym2413_register_port_0_w(machine,0,data); break;
+		case 1: ym2413_data_port_0_w(machine,0,data); break;
+		case 2: dac_0_data_w(machine,0,data);break;
 		default: logerror("%x %x - %x\n",offset,data,activecpu_get_previouspc());
 	}
 }
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index de0fa616fcf..3b4d510ca97 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -78,13 +78,13 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( prehisle_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym3812_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( prehisle_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(D7759_write_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(upd7759_0_reset_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/progolf.c b/src/mame/drivers/progolf.c
index fb24d52c619..6b1f216d32f 100644
--- a/src/mame/drivers/progolf.c
+++ b/src/mame/drivers/progolf.c
@@ -75,10 +75,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x03ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2fff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4fff) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6000, 0x6fff) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8000, 0x8fff) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x2000, 0x2fff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4fff) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6000, 0x6fff) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8fff) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0xc000, 0xcfff) AM_WRITE(interrupt_enable_w)
 	AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c
index f55e4d6731f..c6637039998 100644
--- a/src/mame/drivers/psikyo.c
+++ b/src/mame/drivers/psikyo.c
@@ -411,17 +411,17 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sngkace_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2610_status_port_0_A_r		)
-	AM_RANGE(0x02, 0x02) AM_READ(YM2610_status_port_0_B_r		)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2610_status_port_0_a_r		)
+	AM_RANGE(0x02, 0x02) AM_READ(ym2610_status_port_0_b_r		)
 	AM_RANGE(0x08, 0x08) AM_READ(psikyo_soundlatch_r			)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sngkace_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2610_control_port_0_A_w		)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w		)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM2610_control_port_0_B_w		)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w		)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2610_control_port_0_a_w		)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w		)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym2610_control_port_0_b_w		)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w		)
 	AM_RANGE(0x04, 0x04) AM_WRITE(sngkace_sound_bankswitch_w	)
 	AM_RANGE(0x0c, 0x0c) AM_WRITE(psikyo_clear_nmi_w			)
 ADDRESS_MAP_END
@@ -457,18 +457,18 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gunbird_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x04, 0x04) AM_READ(YM2610_status_port_0_A_r		)
-	AM_RANGE(0x06, 0x06) AM_READ(YM2610_status_port_0_B_r		)
+	AM_RANGE(0x04, 0x04) AM_READ(ym2610_status_port_0_a_r		)
+	AM_RANGE(0x06, 0x06) AM_READ(ym2610_status_port_0_b_r		)
 	AM_RANGE(0x08, 0x08) AM_READ(psikyo_soundlatch_r			)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( gunbird_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w	)
-	AM_RANGE(0x04, 0x04) AM_WRITE(YM2610_control_port_0_A_w		)
-	AM_RANGE(0x05, 0x05) AM_WRITE(YM2610_data_port_0_A_w		)
-	AM_RANGE(0x06, 0x06) AM_WRITE(YM2610_control_port_0_B_w		)
-	AM_RANGE(0x07, 0x07) AM_WRITE(YM2610_data_port_0_B_w		)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ym2610_control_port_0_a_w		)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ym2610_data_port_0_a_w		)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ym2610_control_port_0_b_w		)
+	AM_RANGE(0x07, 0x07) AM_WRITE(ym2610_data_port_0_b_w		)
 	AM_RANGE(0x0c, 0x0c) AM_WRITE(psikyo_clear_nmi_w			)
 ADDRESS_MAP_END
 
@@ -479,7 +479,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( s1945_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x08, 0x08) AM_READ(YMF278B_status_port_0_r		)
+	AM_RANGE(0x08, 0x08) AM_READ(ymf278b_status_port_0_r		)
 	AM_RANGE(0x10, 0x10) AM_READ(psikyo_soundlatch_r			)
 ADDRESS_MAP_END
 
@@ -487,12 +487,12 @@ static ADDRESS_MAP_START( s1945_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(gunbird_sound_bankswitch_w	)
 	AM_RANGE(0x02, 0x03) AM_WRITE(SMH_NOP						)
-	AM_RANGE(0x08, 0x08) AM_WRITE(YMF278B_control_port_0_A_w	)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YMF278B_data_port_0_A_w		)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YMF278B_control_port_0_B_w	)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YMF278B_data_port_0_B_w		)
-	AM_RANGE(0x0c, 0x0c) AM_WRITE(YMF278B_control_port_0_C_w	)
-	AM_RANGE(0x0d, 0x0d) AM_WRITE(YMF278B_data_port_0_C_w		)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ymf278b_control_port_0_a_w	)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ymf278b_data_port_0_a_w		)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ymf278b_control_port_0_b_w	)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ymf278b_data_port_0_b_w		)
+	AM_RANGE(0x0c, 0x0c) AM_WRITE(ymf278b_control_port_0_c_w	)
+	AM_RANGE(0x0d, 0x0d) AM_WRITE(ymf278b_data_port_0_c_w		)
 	AM_RANGE(0x18, 0x18) AM_WRITE(psikyo_clear_nmi_w			)
 ADDRESS_MAP_END
 
@@ -1663,7 +1663,7 @@ static void irqhandler(running_machine *machine, int linestate)
 		cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
 }
 
-static const struct YMF278B_interface ymf278b_interface =
+static const ymf278b_interface ymf278b_config =
 {
 	irqhandler
 };
@@ -1702,7 +1702,7 @@ static MACHINE_DRIVER_START( s1945 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF278B, YMF278B_STD_CLOCK)
-	MDRV_SOUND_CONFIG(ymf278b_interface)
+	MDRV_SOUND_CONFIG(ymf278b_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/psikyo4.c b/src/mame/drivers/psikyo4.c
index 278585eacfc..ada550c9eda 100644
--- a/src/mame/drivers/psikyo4.c
+++ b/src/mame/drivers/psikyo4.c
@@ -364,29 +364,29 @@ static READ32_HANDLER( ps4_sample_r ) /* Send sample data for test */
 
 static READ32_HANDLER( psh_ymf_fm_r )
 {
-	return YMF278B_status_port_0_r(machine, 0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
+	return ymf278b_status_port_0_r(machine, 0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
 }
 
 static WRITE32_HANDLER( psh_ymf_fm_w )
 {
 	if (ACCESSING_BITS_24_31)	// FM bank 1 address (OPL2/OPL3 compatible)
 	{
-		YMF278B_control_port_0_A_w(machine, 0, data>>24);
+		ymf278b_control_port_0_a_w(machine, 0, data>>24);
 	}
 
 	if (ACCESSING_BITS_16_23)	// FM bank 1 data
 	{
-		YMF278B_data_port_0_A_w(machine, 0, data>>16);
+		ymf278b_data_port_0_a_w(machine, 0, data>>16);
 	}
 
 	if (ACCESSING_BITS_8_15)	// FM bank 2 address (OPL3/YMF 262 extended)
 	{
-		YMF278B_control_port_0_B_w(machine, 0, data>>8);
+		ymf278b_control_port_0_b_w(machine, 0, data>>8);
 	}
 
 	if (ACCESSING_BITS_0_7)	// FM bank 2 data
 	{
-		YMF278B_data_port_0_B_w(machine, 0, data);
+		ymf278b_data_port_0_b_w(machine, 0, data);
 	}
 }
 
@@ -394,7 +394,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
 {
 	if (ACCESSING_BITS_24_31)	// PCM address (OPL4/YMF 278B extended)
 	{
-		YMF278B_control_port_0_C_w(machine, 0, data>>24);
+		ymf278b_control_port_0_c_w(machine, 0, data>>24);
 
 #if ROMTEST
 		if (data>>24 == 0x06)	// Reset Sample reading (They always write this code immediately before reading data)
@@ -406,7 +406,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
 
 	if (ACCESSING_BITS_16_23)	// PCM data
 	{
-		YMF278B_data_port_0_C_w(machine, 0, data>>16);
+		ymf278b_data_port_0_c_w(machine, 0, data>>16);
 	}
 }
 
@@ -481,7 +481,7 @@ static void irqhandler(running_machine *machine, int linestate)
 		cpunum_set_input_line(machine, 0, 12, CLEAR_LINE);
 }
 
-static const struct YMF278B_interface ymf278b_interface =
+static const ymf278b_interface ymf278b_config =
 {
 	irqhandler
 };
@@ -520,7 +520,7 @@ static MACHINE_DRIVER_START( ps4big )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
-	MDRV_SOUND_CONFIG(ymf278b_interface)
+	MDRV_SOUND_CONFIG(ymf278b_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/psikyosh.c b/src/mame/drivers/psikyosh.c
index ba00d2cb236..7b92733c6c4 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -462,29 +462,29 @@ static READ32_HANDLER( psh_sample_r ) /* Send sample data for test */
 
 static READ32_HANDLER( psh_ymf_fm_r )
 {
-	return YMF278B_status_port_0_r(machine,0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
+	return ymf278b_status_port_0_r(machine,0)<<24; /* Also, bit 0 being high indicates not ready to send sample data for test */
 }
 
 static WRITE32_HANDLER( psh_ymf_fm_w )
 {
 	if (ACCESSING_BITS_24_31)	// FM bank 1 address (OPL2/OPL3 compatible)
 	{
-		YMF278B_control_port_0_A_w(machine, 0, data>>24);
+		ymf278b_control_port_0_a_w(machine, 0, data>>24);
 	}
 
 	if (ACCESSING_BITS_16_23)	// FM bank 1 data
 	{
-		YMF278B_data_port_0_A_w(machine, 0, data>>16);
+		ymf278b_data_port_0_a_w(machine, 0, data>>16);
 	}
 
 	if (ACCESSING_BITS_8_15)	// FM bank 2 address (OPL3/YMF 262 extended)
 	{
-		YMF278B_control_port_0_B_w(machine, 0, data>>8);
+		ymf278b_control_port_0_b_w(machine, 0, data>>8);
 	}
 
 	if (ACCESSING_BITS_0_7)	// FM bank 2 data
 	{
-		YMF278B_data_port_0_B_w(machine, 0, data);
+		ymf278b_data_port_0_b_w(machine, 0, data);
 	}
 }
 
@@ -492,7 +492,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
 {
 	if (ACCESSING_BITS_24_31)	// PCM address (OPL4/YMF 278B extended)
 	{
-		YMF278B_control_port_0_C_w(machine, 0, data>>24);
+		ymf278b_control_port_0_c_w(machine, 0, data>>24);
 
 #if ROMTEST
 		if (data>>24 == 0x06)	// Reset Sample reading (They always write this code immediately before reading data)
@@ -504,7 +504,7 @@ static WRITE32_HANDLER( psh_ymf_pcm_w )
 
 	if (ACCESSING_BITS_16_23)	// PCM data
 	{
-		YMF278B_data_port_0_C_w(machine, 0, data>>16);
+		ymf278b_data_port_0_c_w(machine, 0, data>>16);
 	}
 }
 
@@ -587,7 +587,7 @@ static void irqhandler(running_machine *machine, int linestate)
 		cpunum_set_input_line(machine, 0, 12, CLEAR_LINE);
 }
 
-static const struct YMF278B_interface ymf278b_interface =
+static const ymf278b_interface ymf278b_config =
 {
 	irqhandler
 };
@@ -621,7 +621,7 @@ static MACHINE_DRIVER_START( psikyo3v1 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF278B, MASTER_CLOCK/2)
-	MDRV_SOUND_CONFIG(ymf278b_interface)
+	MDRV_SOUND_CONFIG(ymf278b_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/psychic5.c b/src/mame/drivers/psychic5.c
index 7cbadb5d8c6..b600bd5c83f 100644
--- a/src/mame/drivers/psychic5.c
+++ b/src/mame/drivers/psychic5.c
@@ -413,10 +413,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/pturn.c b/src/mame/drivers/pturn.c
index c9fbc0ce6ce..3c19ea4cb52 100644
--- a/src/mame/drivers/pturn.c
+++ b/src/mame/drivers/pturn.c
@@ -311,10 +311,10 @@ static ADDRESS_MAP_START( sub_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2000, 0x23ff) AM_RAM
 	AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r) AM_WRITE(nmi_sub_enable_w)
 	AM_RANGE(0x4000, 0x4000) AM_RAM
-	AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x5001, 0x5001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x5000, 0x5000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x5001, 0x5001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static const gfx_layout charlayout =
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 6222a0040d0..42f7c1b42ad 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -124,7 +124,7 @@ INPUT_PORTS_END
 
 static READ16_HANDLER( puckpkmn_YM3438_r )
 {
-	return	YM3438_status_port_0_A_r(machine, 0) << 8;
+	return	ym3438_status_port_0_a_r(machine, 0) << 8;
 }
 
 static WRITE16_HANDLER( puckpkmn_YM3438_w )
@@ -132,12 +132,12 @@ static WRITE16_HANDLER( puckpkmn_YM3438_w )
 	switch (offset)
 	{
 		case 0:
-			if (ACCESSING_BITS_8_15)	YM3438_control_port_0_A_w	(machine, 0,	(data >> 8) & 0xff);
-			else 				YM3438_data_port_0_A_w		(machine, 0,	(data >> 0) & 0xff);
+			if (ACCESSING_BITS_8_15)	ym3438_control_port_0_a_w	(machine, 0,	(data >> 8) & 0xff);
+			else 				ym3438_data_port_0_a_w		(machine, 0,	(data >> 0) & 0xff);
 			break;
 		case 1:
-			if (ACCESSING_BITS_8_15)	YM3438_control_port_0_B_w	(machine, 0,	(data >> 8) & 0xff);
-			else 				YM3438_data_port_0_B_w		(machine, 0,	(data >> 0) & 0xff);
+			if (ACCESSING_BITS_8_15)	ym3438_control_port_0_b_w	(machine, 0,	(data >> 8) & 0xff);
+			else 				ym3438_data_port_0_b_w		(machine, 0,	(data >> 0) & 0xff);
 			break;
 	}
 }
@@ -180,7 +180,7 @@ static ADDRESS_MAP_START( puckpkmn_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 ADDRESS_MAP_END
 
 
-static const struct YM3438interface ym3438_intf =
+static const ym3438_interface ym3438_intf =
 {
 	genesis_irq2_interrupt		/* IRQ handler */
 };
diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c
index 899b7cefaf3..09b59408cbc 100644
--- a/src/mame/drivers/punchout.c
+++ b/src/mame/drivers/punchout.c
@@ -140,24 +140,24 @@ static READ8_HANDLER( punchout_input_3_r )
 {
 	int data = input_port_read(machine, "DSW1");
 	/* bit 4 is busy pin level */
-	if( VLM5030_BSY() ) data &= ~0x10;
+	if( vlm5030_bsy() ) data &= ~0x10;
 	else data |= 0x10;
 	return data;
 }
 
 static WRITE8_HANDLER( punchout_speech_reset_w )
 {
-	VLM5030_RST( data&0x01 );
+	vlm5030_rst( data&0x01 );
 }
 
 static WRITE8_HANDLER( punchout_speech_st_w )
 {
-	VLM5030_ST( data&0x01 );
+	vlm5030_st( data&0x01 );
 }
 
 static WRITE8_HANDLER( punchout_speech_vcu_w )
 {
-	VLM5030_VCU( data & 0x01 );
+	vlm5030_vcu( data & 0x01 );
 }
 
 static WRITE8_HANDLER( punchout_2a03_reset_w )
@@ -450,7 +450,7 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x01) AM_WRITE(SMH_NOP)	/* the 2A03 #1 is not present */
 	AM_RANGE(0x02, 0x02) AM_WRITE(soundlatch_w)
 	AM_RANGE(0x03, 0x03) AM_WRITE(soundlatch2_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(VLM5030_data_w)	/* VLM5030 */
+	AM_RANGE(0x04, 0x04) AM_WRITE(vlm5030_data_w)	/* VLM5030 */
 	AM_RANGE(0x05, 0x05) AM_WRITE(SMH_NOP)	/* unused */
 	AM_RANGE(0x08, 0x08) AM_WRITE(interrupt_enable_w)
 	AM_RANGE(0x09, 0x09) AM_WRITE(SMH_NOP)	/* watchdog reset, seldom used because 08 clears the watchdog as well */
diff --git a/src/mame/drivers/pushman.c b/src/mame/drivers/pushman.c
index e63f6188cf1..0a209802df3 100644
--- a/src/mame/drivers/pushman.c
+++ b/src/mame/drivers/pushman.c
@@ -194,10 +194,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bballs_readmem, ADDRESS_SPACE_PROGRAM, 16 )
diff --git a/src/mame/drivers/quasar.c b/src/mame/drivers/quasar.c
index 6f4b35a9be6..0e5e8d1ad5d 100644
--- a/src/mame/drivers/quasar.c
+++ b/src/mame/drivers/quasar.c
@@ -160,7 +160,7 @@ static READ8_HANDLER( Quasar_T1_r )
 
 static WRITE8_HANDLER( Quasar_DAC_w )
 {
-	DAC_0_signed_data_w(machine,0,data);
+	dac_0_signed_data_w(machine,0,data);
 }
 
 // memory map taken from the manual
diff --git a/src/mame/drivers/quizdna.c b/src/mame/drivers/quizdna.c
index 2225fdef84e..acd03cd309d 100644
--- a/src/mame/drivers/quizdna.c
+++ b/src/mame/drivers/quizdna.c
@@ -72,8 +72,8 @@ static ADDRESS_MAP_START( quizdna_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x81, 0x81) AM_READ(input_port_3_r)
 	AM_RANGE(0x90, 0x90) AM_READ(input_port_4_r)
 	AM_RANGE(0x91, 0x91) AM_READ(input_port_5_r)
-	AM_RANGE(0xe0, 0xe0) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xe1, 0xe1) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xe0, 0xe0) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xe1, 0xe1) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0xf0, 0xf0) AM_READ(okim6295_status_0_r)
 
 ADDRESS_MAP_END
@@ -85,8 +85,8 @@ static ADDRESS_MAP_START( quizdna_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x05, 0x06) AM_WRITE(SMH_NOP) /* unknown */
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
-	AM_RANGE(0xe0, 0xe0) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe1, 0xe1) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xe0, 0xe0) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe1, 0xe1) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xf0, 0xf0) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
@@ -97,8 +97,8 @@ static ADDRESS_MAP_START( gakupara_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x03, 0x04) AM_WRITE(SMH_NOP) /* unknown */
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(quizdna_rombank_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
-	AM_RANGE(0xe0, 0xe0) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe1, 0xe1) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xe0, 0xe0) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe1, 0xe1) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xf0, 0xf0) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
@@ -109,8 +109,8 @@ static ADDRESS_MAP_START( gekiretu_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x05, 0x06) AM_WRITE(SMH_NOP) /* unknown */
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(gekiretu_rombank_w)
 	AM_RANGE(0xd0, 0xd0) AM_WRITE(quizdna_screen_ctrl_w)
-	AM_RANGE(0xe0, 0xe0) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe1, 0xe1) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xe0, 0xe0) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe1, 0xe1) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xf0, 0xf0) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/quizo.c b/src/mame/drivers/quizo.c
index af7b9c64335..e2f1da12cbd 100644
--- a/src/mame/drivers/quizo.c
+++ b/src/mame/drivers/quizo.c
@@ -128,8 +128,8 @@ static ADDRESS_MAP_START( portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x00, 0x00) AM_READ(input_port_0_r)
 	AM_RANGE(0x10, 0x10) AM_READ(input_port_1_r)
 	AM_RANGE(0x40, 0x40) AM_READ(input_port_2_r)
-	AM_RANGE(0x50, 0x50) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x51, 0x51) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x50, 0x50) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x51, 0x51) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x60, 0x60) AM_WRITE(port60_w)
 	AM_RANGE(0x70, 0x70) AM_WRITE(port70_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/quizpun2.c b/src/mame/drivers/quizpun2.c
index 3f5289c57a9..c833657a7fc 100644
--- a/src/mame/drivers/quizpun2.c
+++ b/src/mame/drivers/quizpun2.c
@@ -326,8 +326,8 @@ static ADDRESS_MAP_START( quizpun2_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x00, 0x00 ) AM_WRITE( SMH_NOP )	// IRQ end
 	AM_RANGE( 0x20, 0x20 ) AM_WRITE( SMH_NOP )	// NMI end
 	AM_RANGE( 0x40, 0x40 ) AM_READ( soundlatch_r )
-	AM_RANGE( 0x60, 0x60 ) AM_READWRITE( YM2203_status_port_0_r, YM2203_control_port_0_w )
-	AM_RANGE( 0x61, 0x61 ) AM_WRITE	   ( YM2203_write_port_0_w )
+	AM_RANGE( 0x60, 0x60 ) AM_READWRITE( ym2203_status_port_0_r, ym2203_control_port_0_w )
+	AM_RANGE( 0x61, 0x61 ) AM_WRITE	   ( ym2203_write_port_0_w )
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c
index 4b193585029..94de61ff279 100644
--- a/src/mame/drivers/r2dtank.c
+++ b/src/mame/drivers/r2dtank.c
@@ -150,12 +150,12 @@ static READ8_HANDLER( AY8910_port_r )
 
 	if (AY8910_selected & 0x08)
 {
-		ret = AY8910_read_port_0_r(machine, offset);
+		ret = ay8910_read_port_0_r(machine, offset);
 if (LOG_AUDIO_COMM) logerror("%08X  CPU#1  AY8910 #0 Port Read: %x\n", safe_activecpu_get_pc(), ret);}
 
 	if (AY8910_selected & 0x10)
 {
-		ret = AY8910_read_port_1_r(machine, offset);
+		ret = ay8910_read_port_1_r(machine, offset);
 if (LOG_AUDIO_COMM) logerror("%08X  CPU#1  AY8910 #1 Port Read: %x\n", safe_activecpu_get_pc(), ret);}
 
 	return ret;
@@ -168,23 +168,23 @@ static WRITE8_HANDLER( AY8910_port_w )
 	{
 		if (AY8910_selected & 0x08)
 {if (LOG_AUDIO_COMM) logerror("%08X  CPU#1  AY8910 #0 Control Write: %x\n", safe_activecpu_get_pc(), data);
-			AY8910_control_port_0_w(machine, offset, data);
+			ay8910_control_port_0_w(machine, offset, data);
 }
 		if (AY8910_selected & 0x10)
 {if (LOG_AUDIO_COMM) logerror("%08X  CPU#1  AY8910 #1 Control Write: %x\n", safe_activecpu_get_pc(), data);
-			AY8910_control_port_1_w(machine, offset, data);
+			ay8910_control_port_1_w(machine, offset, data);
 }
 	}
 	else
 	{
 		if (AY8910_selected & 0x08)
 {if (LOG_AUDIO_COMM) logerror("%08X  CPU#1  AY8910 #0 Port Write: %x\n", safe_activecpu_get_pc(), data);
-			AY8910_write_port_0_w(machine, offset, data);
+			ay8910_write_port_0_w(machine, offset, data);
 }
 
 		if (AY8910_selected & 0x10)
 {if (LOG_AUDIO_COMM) logerror("%08X  CPU#1  AY8910 #1 Port Write: %x\n", safe_activecpu_get_pc(), data);
-			AY8910_write_port_1_w(machine, offset, data);
+			ay8910_write_port_1_w(machine, offset, data);
 }
 	}
 }
diff --git a/src/mame/drivers/rainbow.c b/src/mame/drivers/rainbow.c
index 766447425b7..7f41e5a40a5 100644
--- a/src/mame/drivers/rainbow.c
+++ b/src/mame/drivers/rainbow.c
@@ -360,7 +360,7 @@ static ADDRESS_MAP_START( rainbow_s_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK5)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x9001, 0x9001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x9002, 0x9100) AM_READ(SMH_RAM)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -368,8 +368,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( rainbow_s_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 ADDRESS_MAP_END
@@ -377,8 +377,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( jumping_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xb400, 0xb400) AM_READ(YM2203_status_port_1_r)
+	AM_RANGE(0xb000, 0xb000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xb400, 0xb400) AM_READ(ym2203_status_port_1_r)
 	AM_RANGE(0xb800, 0xb800) AM_READ(jumping_latch_r)
 	AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM)
 ADDRESS_MAP_END
@@ -386,10 +386,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( jumping_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xb000, 0xb000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xb001, 0xb001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xb400, 0xb400) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xb401, 0xb401) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xb000, 0xb000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xb001, 0xb001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xb400, 0xb400) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xb401, 0xb401) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xbc00, 0xbc00) AM_WRITE(SMH_NOP)	/* looks like a bankswitch, but sound works with or without it */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/rampart.c b/src/mame/drivers/rampart.c
index ff563bb17c8..cb16c4e03aa 100644
--- a/src/mame/drivers/rampart.c
+++ b/src/mame/drivers/rampart.c
@@ -108,9 +108,9 @@ static WRITE16_HANDLER( ym2413_w )
 	if (ACCESSING_BITS_8_15)
 	{
 		if (offset & 1)
-			YM2413_data_port_0_w(machine, 0, (data >> 8) & 0xff);
+			ym2413_data_port_0_w(machine, 0, (data >> 8) & 0xff);
 		else
-			YM2413_register_port_0_w(machine, 0, (data >> 8) & 0xff);
+			ym2413_register_port_0_w(machine, 0, (data >> 8) & 0xff);
 	}
 }
 
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 93275a1c923..b3099a619f3 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -246,8 +246,8 @@ static ADDRESS_MAP_START( rastan_s_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
 	AM_RANGE(0x8000, 0x8fff) AM_RAM
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(rastan_msm5205_address_w)
diff --git a/src/mame/drivers/rcasino.c b/src/mame/drivers/rcasino.c
index 75fc7fd86f8..3ab2d6606f9 100644
--- a/src/mame/drivers/rcasino.c
+++ b/src/mame/drivers/rcasino.c
@@ -177,9 +177,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( rcasino_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x10, 0x10) AM_READ_PORT("IN0") AM_WRITE(rcasino_port_10_w)
 //  AM_RANGE(0x11, 0x11) AM_READ_PORT("IN1") AM_WRITE(rcasino_port_11_w)
 	AM_RANGE(0x11, 0x11) AM_READWRITE(rcasino_port_11_r, rcasino_port_11_w)
diff --git a/src/mame/drivers/realbrk.c b/src/mame/drivers/realbrk.c
index 2402b69dad6..1ef85a6d19e 100644
--- a/src/mame/drivers/realbrk.c
+++ b/src/mame/drivers/realbrk.c
@@ -162,16 +162,16 @@ static ADDRESS_MAP_START( base_mem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x604000, 0x604fff) AM_READWRITE(SMH_RAM,realbrk_vram_2_w) AM_BASE(&realbrk_vram_2	)	// Text         (2)
 	AM_RANGE(0x606000, 0x60600f) AM_READWRITE(SMH_RAM,realbrk_vregs_w) AM_BASE(&realbrk_vregs 	)	// Scroll + Video Regs
 	AM_RANGE(0x605000, 0x61ffff) AM_RAM							               	//
-	AM_RANGE(0x800000, 0x800001) AM_WRITE(YMZ280B_register_0_msb_w			)	// YMZ280
-	AM_RANGE(0x800002, 0x800003) AM_READWRITE(YMZ280B_status_0_msb_r,YMZ280B_data_0_msb_w)	//
+	AM_RANGE(0x800000, 0x800001) AM_WRITE(ymz280b_register_0_msb_w			)	// YMZ280
+	AM_RANGE(0x800002, 0x800003) AM_READWRITE(ymz280b_status_0_msb_r,ymz280b_data_0_msb_w)	//
 	AM_RANGE(0xfe0000, 0xfeffff) AM_RAM						                 	// RAM
 	AM_RANGE(0xfffc00, 0xffffff) AM_READWRITE(SMH_RAM,tmp68301_regs_w) AM_BASE(&tmp68301_regs	)	// TMP68301 Registers
 ADDRESS_MAP_END
 
 /*realbrk specific memory map*/
 static ADDRESS_MAP_START( realbrk_mem, ADDRESS_SPACE_PROGRAM, 16 )
-	AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w		)	// YM2413
-	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w			)	//
+	AM_RANGE(0x800008, 0x800009) AM_WRITE(ym2413_register_port_0_lsb_w		)	// YM2413
+	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(ym2413_data_port_0_lsb_w			)	//
 	AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0")							// P1 & P2 (Inputs)
 	AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1")							// Coins
 	AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select)	// DSW select
@@ -181,16 +181,16 @@ ADDRESS_MAP_END
 
 /*pkgnsh specific memory map*/
 static ADDRESS_MAP_START( pkgnsh_mem, ADDRESS_SPACE_PROGRAM, 16 )
-	AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_msb_w		)	// YM2413
-	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_msb_w			)	//
+	AM_RANGE(0x800008, 0x800009) AM_WRITE(ym2413_register_port_0_msb_w		)	// YM2413
+	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(ym2413_data_port_0_msb_w			)	//
 	AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnsh_input_r		        )	// P1 & P2 (Inputs)
 	AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_r,backup_ram_w) AM_BASE(&backup_ram)	// RAM
 ADDRESS_MAP_END
 
 /*pkgnshdx specific memory map*/
 static ADDRESS_MAP_START( pkgnshdx_mem, ADDRESS_SPACE_PROGRAM, 16)
-	AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w		)	// YM2413
-	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w			)	//
+	AM_RANGE(0x800008, 0x800009) AM_WRITE(ym2413_register_port_0_lsb_w		)	// YM2413
+	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(ym2413_data_port_0_lsb_w			)	//
 	AM_RANGE(0xc00000, 0xc00013) AM_READ(pkgnshdx_input_r		        )	// P1 & P2 (Inputs)
 	AM_RANGE(0xc00004, 0xc00005) AM_WRITE(SMH_RAM) AM_BASE(&realbrk_dsw_select) // DSW select
 	AM_RANGE(0xff0000, 0xfffbff) AM_READWRITE(backup_ram_dx_r,backup_ram_w) AM_BASE(&backup_ram)	// RAM
@@ -200,8 +200,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( dai2kaku_mem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x605000, 0x6053ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_0ras)	// rasterinfo   (0)
 	AM_RANGE(0x605400, 0x6057ff) AM_READWRITE(SMH_RAM,SMH_RAM) AM_BASE(&realbrk_vram_1ras)	// rasterinfo   (1)
-	AM_RANGE(0x800008, 0x800009) AM_WRITE(YM2413_register_port_0_lsb_w		)	// YM2413
-	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(YM2413_data_port_0_lsb_w			)	//
+	AM_RANGE(0x800008, 0x800009) AM_WRITE(ym2413_register_port_0_lsb_w		)	// YM2413
+	AM_RANGE(0x80000a, 0x80000b) AM_WRITE(ym2413_data_port_0_lsb_w			)	//
 	AM_RANGE(0xc00000, 0xc00001) AM_READ_PORT("IN0")							// P1 & P2 (Inputs)
 	AM_RANGE(0xc00002, 0xc00003) AM_READ_PORT("IN1")							// Coins
 	AM_RANGE(0xc00004, 0xc00005) AM_READWRITE(realbrk_dsw_r,SMH_RAM) AM_BASE(&realbrk_dsw_select)	// DSW select
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 3aab745caa4..bac3baca9ee 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -176,9 +176,9 @@ static WRITE16_HANDLER( ym2413_w )
 	if (ACCESSING_BITS_0_7)
 	{
 		if (offset & 1)
-			YM2413_data_port_0_w(machine, 0, data & 0xff);
+			ym2413_data_port_0_w(machine, 0, data & 0xff);
 		else
-			YM2413_register_port_0_w(machine, 0, data & 0xff);
+			ym2413_register_port_0_w(machine, 0, data & 0xff);
 	}
 }
 
diff --git a/src/mame/drivers/renegade.c b/src/mame/drivers/renegade.c
index 090255db493..72bf277d3d9 100644
--- a/src/mame/drivers/renegade.c
+++ b/src/mame/drivers/renegade.c
@@ -556,7 +556,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_READ(SMH_RAM)
 	AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
-	AM_RANGE(0x2801, 0x2801) AM_READ(YM3526_status_port_0_r)
+	AM_RANGE(0x2801, 0x2801) AM_READ(ym3526_status_port_0_r)
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)
 ADDRESS_MAP_END
 
@@ -564,8 +564,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(SMH_NOP) // this gets written the same values as 0x2000
 	AM_RANGE(0x2000, 0x2000) AM_WRITE(adpcm_play_w)
-	AM_RANGE(0x2800, 0x2800) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x2801, 0x2801) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0x2800, 0x2800) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x2801, 0x2801) AM_WRITE(ym3526_write_port_0_w)
 	AM_RANGE(0x3000, 0x3000) AM_WRITE(SMH_NOP) /* adpcm related? stereo pan? */
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/rmhaihai.c b/src/mame/drivers/rmhaihai.c
index 7b75828b11d..162ac3d4ba4 100644
--- a/src/mame/drivers/rmhaihai.c
+++ b/src/mame/drivers/rmhaihai.c
@@ -202,14 +202,14 @@ static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(samples_r)
 	AM_RANGE(0x8000, 0x8000) AM_READ(keyboard_r)
 	AM_RANGE(0x8001, 0x8001) AM_READ(SMH_NOP)	// ??
-	AM_RANGE(0x8020, 0x8020) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x8020, 0x8020) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP)	// ??
 	AM_RANGE(0x8001, 0x8001) AM_WRITE(keyboard_w)
-	AM_RANGE(0x8020, 0x8020) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8021, 0x8021) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8020, 0x8020) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8021, 0x8021) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x8040, 0x8040) AM_WRITE(adpcm_w)
 	AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w)
 	AM_RANGE(0x8080, 0x8080) AM_WRITE(SMH_NOP)	// ??
@@ -221,8 +221,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( themj_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x8000, 0x8000) AM_WRITE(SMH_NOP)	// ??
 	AM_RANGE(0x8001, 0x8001) AM_WRITE(keyboard_w)
-	AM_RANGE(0x8020, 0x8020) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8021, 0x8021) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x8020, 0x8020) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8021, 0x8021) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x8040, 0x8040) AM_WRITE(adpcm_w)
 	AM_RANGE(0x8060, 0x8060) AM_WRITE(ctrl_w)
 	AM_RANGE(0x8080, 0x8080) AM_WRITE(SMH_NOP)	// ??
diff --git a/src/mame/drivers/rockrage.c b/src/mame/drivers/rockrage.c
index 74176eeb615..933c622316e 100644
--- a/src/mame/drivers/rockrage.c
+++ b/src/mame/drivers/rockrage.c
@@ -91,13 +91,13 @@ static WRITE8_HANDLER( rockrage_sh_irqtrigger_w )
 }
 
 static READ8_HANDLER( rockrage_VLM5030_busy_r ) {
-	return ( VLM5030_BSY() ? 1 : 0 );
+	return ( vlm5030_bsy() ? 1 : 0 );
 }
 
 static WRITE8_HANDLER( rockrage_speech_w ) {
 	/* bit2 = data bus enable */
-	VLM5030_RST( ( data >> 1 ) & 0x01 );
-	VLM5030_ST(  ( data >> 0 ) & 0x01 );
+	vlm5030_rst( ( data >> 1 ) & 0x01 );
+	vlm5030_st(  ( data >> 0 ) & 0x01 );
 }
 
 static ADDRESS_MAP_START( rockrage_readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -133,16 +133,16 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( rockrage_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x3000, 0x3000) AM_READ(rockrage_VLM5030_busy_r)/* VLM5030 */
 	AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r)			/* soundlatch_r */
-	AM_RANGE(0x6001, 0x6001) AM_READ(YM2151_status_port_0_r)	/* YM 2151 */
+	AM_RANGE(0x6001, 0x6001) AM_READ(ym2151_status_port_0_r)	/* YM 2151 */
 	AM_RANGE(0x7000, 0x77ff) AM_READ(SMH_RAM)				/* RAM */
 	AM_RANGE(0x8000, 0xffff) AM_READ(SMH_ROM)				/* ROM */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( rockrage_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(VLM5030_data_w) 			/* VLM5030 */
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(vlm5030_data_w) 			/* VLM5030 */
 	AM_RANGE(0x4000, 0x4000) AM_WRITE(rockrage_speech_w)			/* VLM5030 */
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(YM2151_register_port_0_w)	/* YM 2151 */
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(YM2151_data_port_0_w)		/* YM 2151 */
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ym2151_register_port_0_w)	/* YM 2151 */
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ym2151_data_port_0_w)		/* YM 2151 */
 	AM_RANGE(0x7000, 0x77ff) AM_WRITE(SMH_RAM)					/* RAM */
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)					/* ROM */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 5d7489ee62a..5c505c3a93a 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -328,7 +328,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(okim6295_status_1_r)
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
@@ -338,7 +338,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_WRITE(YM2151_word_0_w)
+	AM_RANGE(0x110000, 0x110001) AM_WRITE(ym2151_word_0_w)
 	AM_RANGE(0x120000, 0x120001) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_WRITE(okim6295_data_1_w)
 	AM_RANGE(0x1f0000, 0x1f1fff) AM_WRITE(SMH_BANK8)
diff --git a/src/mame/drivers/rollerg.c b/src/mame/drivers/rollerg.c
index 93f4962ca3d..774743f37b3 100644
--- a/src/mame/drivers/rollerg.c
+++ b/src/mame/drivers/rollerg.c
@@ -113,15 +113,15 @@ static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa02f) AM_READ(k053260_0_r)
-	AM_RANGE(0xc000, 0xc000) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0xc000, 0xc000) AM_READ(ym3812_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xa000, 0xa02f) AM_WRITE(k053260_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/rollrace.c b/src/mame/drivers/rollrace.c
index 381bbd771a8..db3fdaf8cdb 100644
--- a/src/mame/drivers/rollrace.c
+++ b/src/mame/drivers/rollrace.c
@@ -82,12 +82,12 @@ static ADDRESS_MAP_START( writemem_snd, ADDRESS_SPACE_PROGRAM, 8 )
 		AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_ROM)
 		AM_RANGE(0x2000, 0x2fff) AM_WRITE(SMH_RAM)
 		AM_RANGE(0x3000, 0x3000) AM_WRITE(interrupt_enable_w)
-		AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_0_w)
-		AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_0_w)
-		AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_1_w)
-		AM_RANGE(0x5001, 0x5001) AM_WRITE(AY8910_write_port_1_w)
-		AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_2_w)
-		AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_2_w)
+		AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_0_w)
+		AM_RANGE(0x4001, 0x4001) AM_WRITE(ay8910_write_port_0_w)
+		AM_RANGE(0x5000, 0x5000) AM_WRITE(ay8910_control_port_1_w)
+		AM_RANGE(0x5001, 0x5001) AM_WRITE(ay8910_write_port_1_w)
+		AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_2_w)
+		AM_RANGE(0x6001, 0x6001) AM_WRITE(ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/route16.c b/src/mame/drivers/route16.c
index eb8fb10beb6..dae0c300d5d 100644
--- a/src/mame/drivers/route16.c
+++ b/src/mame/drivers/route16.c
@@ -273,8 +273,8 @@ static ADDRESS_MAP_START( ttmahjng_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4800, 0x4800) AM_READ_PORT("DSW") AM_WRITE(route16_out0_w)
 	AM_RANGE(0x5000, 0x5000) AM_READ_PORT("IN0") AM_WRITE(route16_out1_w)
 	AM_RANGE(0x5800, 0x5800) AM_READWRITE(ttmahjng_input_port_matrix_r, ttmahjng_input_port_matrix_w)
-	AM_RANGE(0x6800, 0x6800) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6900, 0x6900) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x6800, 0x6800) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6900, 0x6900) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram1) AM_SIZE(&route16_videoram_size)
 ADDRESS_MAP_END
 
@@ -288,7 +288,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( stratvox_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
-	AM_RANGE(0x2800, 0x2800) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x2800, 0x2800) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x4000, 0x43ff) AM_READWRITE(sharedram_r, sharedram_w)
 	AM_RANGE(0x8000, 0xbfff) AM_RAM AM_BASE(&route16_videoram2)
 ADDRESS_MAP_END
@@ -296,8 +296,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cpu1_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0x1ff)
-	AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x00ff) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x00ff) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x0000, 0x0000) AM_MIRROR(0x00ff) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0100, 0x0100) AM_MIRROR(0x00ff) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c
index 37998e0f61e..53649b5603f 100644
--- a/src/mame/drivers/royalmah.c
+++ b/src/mame/drivers/royalmah.c
@@ -380,18 +380,18 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( royalmah_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ippatsu_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x12, 0x12 ) AM_READ_PORT("DSW2")
@@ -400,9 +400,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( suzume_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x80, 0x80 ) AM_READ( suzume_dsw_r )
@@ -411,9 +411,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( dondenmj_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x85, 0x85 ) AM_READ_PORT("DSW2")	// DSW2
@@ -423,9 +423,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mjdiplob_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x61, 0x61 ) AM_WRITE(tontonb_bank_w)
@@ -435,9 +435,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tontonb_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x44, 0x44 ) AM_WRITE( tontonb_bank_w )
@@ -447,9 +447,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( majs101b_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( royalmah_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x00, 0x00 ) AM_READWRITE( majs101b_dsw_r, dynax_bank_w )
@@ -457,9 +457,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( mjderngr_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 //  AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1")
 	AM_RANGE( 0x10, 0x10 ) AM_WRITE( mjderngr_coin_w )	// palette bank is set separately
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
@@ -472,9 +472,9 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( mjapinky_iomap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE( 0x00, 0x00 ) AM_WRITE( mjapinky_bank_w )
-	AM_RANGE( 0x01, 0x01 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x02, 0x02 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x03, 0x03 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x01, 0x01 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x02, 0x02 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x03, 0x03 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x04, 0x04 ) AM_READ_PORT("DSW2")
 	AM_RANGE( 0x10, 0x10 ) AM_READ_PORT("DSW1") AM_WRITE( mjapinky_palbank_w )
 	AM_RANGE( 0x11, 0x11 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
@@ -546,9 +546,9 @@ static ADDRESS_MAP_START( janptr96_iomap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE( 0x20, 0x20 ) AM_READWRITE( janptr96_unknown_r, janptr96_rambank_w )
 	AM_RANGE( 0x50, 0x50 ) AM_WRITE( mjderngr_palbank_w )
 	AM_RANGE( 0x60, 0x6f ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w)
-	AM_RANGE( 0x81, 0x81 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x82, 0x82 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x83, 0x83 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x81, 0x81 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x82, 0x82 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x83, 0x83 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x93, 0x93 ) AM_WRITE( input_port_select_w )
 	AM_RANGE( 0xd8, 0xd8 ) AM_WRITE( janptr96_coin_counter_w )
 	AM_RANGE( 0xd9, 0xd9 ) AM_READ_PORT("SYSTEM")
@@ -578,7 +578,7 @@ static READ8_HANDLER( mjifb_rom_io_r )
 	{
 		case 0x8000:	return input_port_read(machine, "DSW4");		// dsw 4
 		case 0x8200:	return input_port_read(machine, "DSW3");		// dsw 3
-		case 0x9001:	return AY8910_read_port_0_r(machine, 0);	// inputs
+		case 0x9001:	return ay8910_read_port_0_r(machine, 0);	// inputs
 		case 0x9011:	return input_port_read(machine, "SYSTEM");
 	}
 
@@ -599,8 +599,8 @@ static WRITE8_HANDLER( mjifb_rom_io_w )
 	switch(offset)
 	{
 		case 0x8e00:	palette_base = data & 0x1f;	return;
-		case 0x9002:	AY8910_write_port_0_w(machine,0,data);			return;
-		case 0x9003:	AY8910_control_port_0_w(machine,0,data);		return;
+		case 0x9002:	ay8910_write_port_0_w(machine,0,data);			return;
+		case 0x9003:	ay8910_control_port_0_w(machine,0,data);		return;
 		case 0x9010:
 			mjifb_coin_counter_w(machine,0,data);
 			return;
@@ -685,7 +685,7 @@ static READ8_HANDLER( mjdejavu_rom_io_r )
 	{
 		case 0x8000:	return input_port_read(machine, "DSW2");		// dsw 2
 		case 0x8001:	return input_port_read(machine, "DSW1");		// dsw 1
-		case 0x9001:	return AY8910_read_port_0_r(machine, 0);	// inputs
+		case 0x9001:	return ay8910_read_port_0_r(machine, 0);	// inputs
 		case 0x9011:	return input_port_read(machine, "SYSTEM");
 	}
 
@@ -705,8 +705,8 @@ static WRITE8_HANDLER( mjdejavu_rom_io_w )
 	switch(offset)
 	{
 		case 0x8802:	palette_base = data & 0x1f;					return;
-		case 0x9002:	AY8910_write_port_0_w(machine,0,data);		return;
-		case 0x9003:	AY8910_control_port_0_w(machine,0,data);	return;
+		case 0x9002:	ay8910_write_port_0_w(machine,0,data);		return;
+		case 0x9003:	ay8910_control_port_0_w(machine,0,data);	return;
 		case 0x9010:	mjifb_coin_counter_w(machine,0,data);		return;
 		case 0x9011:	input_port_select_w(machine,0,data);		return;
 		case 0x9013:
@@ -752,9 +752,9 @@ static WRITE8_HANDLER( mjtensin_6ff3_w )
 static ADDRESS_MAP_START( mjtensin_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE( 0x0000, 0x5fff ) AM_ROM
 	AM_RANGE( 0x6000, 0x6fbf ) AM_RAM
-	AM_RANGE( 0x6fc1, 0x6fc1 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x6fc2, 0x6fc2 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x6fc3, 0x6fc3 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x6fc1, 0x6fc1 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x6fc2, 0x6fc2 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x6fc3, 0x6fc3 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x6fd0, 0x6fd0 ) AM_WRITE( janptr96_coin_counter_w )
 	AM_RANGE( 0x6fd1, 0x6fd1 ) AM_READ_PORT("SYSTEM") AM_WRITE( input_port_select_w )
 	AM_RANGE( 0x6fe0, 0x6fef ) AM_DEVREADWRITE(MSM6242, "rtc", msm6242_r, msm6242_w)
@@ -821,9 +821,9 @@ static WRITE8_HANDLER( cafetime_7fe3_w )
 static ADDRESS_MAP_START( cafetime_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE( 0x0000, 0x5fff ) AM_ROM
 	AM_RANGE( 0x6000, 0x7eff ) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-	AM_RANGE( 0x7fc1, 0x7fc1 ) AM_READ( AY8910_read_port_0_r )
-	AM_RANGE( 0x7fc2, 0x7fc2 ) AM_WRITE( AY8910_write_port_0_w )
-	AM_RANGE( 0x7fc3, 0x7fc3 ) AM_WRITE( AY8910_control_port_0_w )
+	AM_RANGE( 0x7fc1, 0x7fc1 ) AM_READ( ay8910_read_port_0_r )
+	AM_RANGE( 0x7fc2, 0x7fc2 ) AM_WRITE( ay8910_write_port_0_w )
+	AM_RANGE( 0x7fc3, 0x7fc3 ) AM_WRITE( ay8910_control_port_0_w )
 	AM_RANGE( 0x7fd0, 0x7fd0 ) AM_WRITE( janptr96_coin_counter_w )
 	AM_RANGE( 0x7fd1, 0x7fd1 ) AM_READ_PORT("SYSTEM") AM_WRITENOP
 	AM_RANGE( 0x7fd3, 0x7fd3 ) AM_WRITE( input_port_select_w )
diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c
index 1f9a524356a..4ce3e61beb6 100644
--- a/src/mame/drivers/rpunch.c
+++ b/src/mame/drivers/rpunch.c
@@ -279,7 +279,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
-	AM_RANGE(0xf000, 0xf001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xf000, 0xf001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xf200, 0xf200) AM_READ(sound_command_r)
 	AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
 ADDRESS_MAP_END
@@ -287,8 +287,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xf400, 0xf400) AM_WRITE(upd_control_w)
 	AM_RANGE(0xf600, 0xf600) AM_WRITE(upd_data_w)
 	AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM)
diff --git a/src/mame/drivers/sandscrp.c b/src/mame/drivers/sandscrp.c
index 3d0665c4ae9..81849324aed 100644
--- a/src/mame/drivers/sandscrp.c
+++ b/src/mame/drivers/sandscrp.c
@@ -270,8 +270,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sandscrp_soundport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(sandscrp_bankswitch_w)	// ROM Bank
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)	// YM2203
-	AM_RANGE(0x03, 0x03) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)		// PORTA/B read
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)	// YM2203
+	AM_RANGE(0x03, 0x03) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)		// PORTA/B read
 	AM_RANGE(0x04, 0x04) AM_WRITE(okim6295_data_0_w)		// OKIM6295
 	AM_RANGE(0x06, 0x06) AM_WRITE(sandscrp_soundlatch_w)	//
 	AM_RANGE(0x07, 0x07) AM_READ(sandscrp_soundlatch_r)		//
diff --git a/src/mame/drivers/sangho.c b/src/mame/drivers/sangho.c
index f2310eb20ab..d5148646ffb 100644
--- a/src/mame/drivers/sangho.c
+++ b/src/mame/drivers/sangho.c
@@ -88,8 +88,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START (writeport_pzlestar, ADDRESS_SPACE_IO, 8)
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE( 0x91, 0x91) AM_WRITE( pzlestar_bank_w )
-	AM_RANGE( 0x7c, 0x7c) AM_WRITE( YM2413_register_port_0_w )
-	AM_RANGE( 0x7d, 0x7d) AM_WRITE( YM2413_data_port_0_w )
+	AM_RANGE( 0x7c, 0x7c) AM_WRITE( ym2413_register_port_0_w )
+	AM_RANGE( 0x7d, 0x7d) AM_WRITE( ym2413_data_port_0_w )
 	AM_RANGE( 0x98, 0x98) AM_WRITE( v9938_0_vram_w )
 	AM_RANGE( 0x99, 0x99) AM_WRITE( v9938_0_command_w )
 	AM_RANGE( 0x9a, 0x9a) AM_WRITE( v9938_0_palette_w )
@@ -109,8 +109,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START (writeport_sexyboom, ADDRESS_SPACE_IO, 8)
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x7c, 0x7c) AM_WRITE( YM2413_register_port_0_w )
-	AM_RANGE( 0x7d, 0x7d) AM_WRITE( YM2413_data_port_0_w )
+	AM_RANGE( 0x7c, 0x7c) AM_WRITE( ym2413_register_port_0_w )
+	AM_RANGE( 0x7d, 0x7d) AM_WRITE( ym2413_data_port_0_w )
 	AM_RANGE( 0xf0, 0xf0) AM_WRITE( v9938_0_vram_w )
 	AM_RANGE( 0xf1, 0xf1) AM_WRITE( v9938_0_command_w )
 	AM_RANGE( 0xf2, 0xf2) AM_WRITE( v9938_0_palette_w )
diff --git a/src/mame/drivers/sauro.c b/src/mame/drivers/sauro.c
index 075ae49b45e..bc4b76ff89f 100644
--- a/src/mame/drivers/sauro.c
+++ b/src/mame/drivers/sauro.c
@@ -194,8 +194,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sauro_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(adpcm_w)
 	AM_RANGE(0xe000, 0xe006) AM_WRITE(SMH_NOP)	/* echo from write to e0000 */
 	AM_RANGE(0xe00e, 0xe00f) AM_WRITE(SMH_NOP)
@@ -218,8 +218,8 @@ static ADDRESS_MAP_START( trckydoc_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xec00, 0xefff) AM_WRITE(trckydoc_spriteram_mirror_w) // it clears sprites from the screen by writing here to set some of the attributes
 	AM_RANGE(0xf000, 0xf3ff) AM_WRITE(tecfri_videoram_w) AM_BASE(&tecfri_videoram)
 	AM_RANGE(0xf400, 0xf7ff) AM_WRITE(tecfri_colorram_w) AM_BASE(&tecfri_colorram)
-	AM_RANGE(0xf820, 0xf820) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xf821, 0xf821) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xf820, 0xf820) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xf821, 0xf821) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xf830, 0xf830) AM_WRITE(tecfri_scroll_bg_w)
 	AM_RANGE(0xf838, 0xf838) AM_WRITE(SMH_NOP)				/* only written at startup */
 	AM_RANGE(0xf839, 0xf839) AM_WRITE(flip_screen_w)
diff --git a/src/mame/drivers/sbasketb.c b/src/mame/drivers/sbasketb.c
index c4247630318..7fc83ecd759 100644
--- a/src/mame/drivers/sbasketb.c
+++ b/src/mame/drivers/sbasketb.c
@@ -90,9 +90,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(VLM5030_data_w) /* speech data */
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(vlm5030_data_w) /* speech data */
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(hyperspt_sound_w)     /* speech and output controll */
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0xe001, 0xe001) AM_WRITE(konami_SN76496_latch_w)  /* Loads the snd command into the snd latch */
 	AM_RANGE(0xe002, 0xe002) AM_WRITE(konami_SN76496_0_w)      /* This address triggers the SN chip to read the data port. */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/sbowling.c b/src/mame/drivers/sbowling.c
index dddb535fcb3..99e4eab23af 100644
--- a/src/mame/drivers/sbowling.c
+++ b/src/mame/drivers/sbowling.c
@@ -185,8 +185,8 @@ static READ8_HANDLER (controls_r)
 static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x2fff) AM_ROM
 	AM_RANGE(0x8000, 0xbfff) AM_RAM_WRITE(sbw_videoram_w) AM_BASE(&videoram) AM_SIZE(&videoram_size)
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 	AM_RANGE(0xfc00, 0xffff) AM_RAM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/sbrkout.c b/src/mame/drivers/sbrkout.c
index 5bffc6fca1f..b7ca7939615 100644
--- a/src/mame/drivers/sbrkout.c
+++ b/src/mame/drivers/sbrkout.c
@@ -119,7 +119,7 @@ static TIMER_CALLBACK( scanline_callback )
 		cpunum_set_input_line(machine, 0, 0, ASSERT_LINE);
 
 	/* update the DAC state */
-	DAC_data_w(0, (videoram[0x380 + 0x11] & (scanline >> 2)) ? 255 : 0);
+	dac_data_w(0, (videoram[0x380 + 0x11] & (scanline >> 2)) ? 255 : 0);
 
 	/* on the VBLANK, read the pot and schedule an interrupt time for it */
 	if (scanline == video_screen_get_visible_area(machine->primary_screen)->max_y + 1)
diff --git a/src/mame/drivers/scobra.c b/src/mame/drivers/scobra.c
index a09a64e624f..40687cb9e07 100644
--- a/src/mame/drivers/scobra.c
+++ b/src/mame/drivers/scobra.c
@@ -405,16 +405,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( scobra_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x20, 0x20) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x80, 0x80) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x20, 0x20) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x80, 0x80) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( scobra_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hustler_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -431,24 +431,24 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hustler_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x40, 0x40) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hustler_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hustlerb_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x80, 0x80) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hustlerb_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 #define SCOBRA_IN0\
diff --git a/src/mame/drivers/scotrsht.c b/src/mame/drivers/scotrsht.c
index 9930e588b30..3127575642e 100644
--- a/src/mame/drivers/scotrsht.c
+++ b/src/mame/drivers/scotrsht.c
@@ -72,8 +72,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( scotrsht_sound_port, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( scotrsht )
diff --git a/src/mame/drivers/scramble.c b/src/mame/drivers/scramble.c
index 427ff674183..e3b94e5b5ae 100644
--- a/src/mame/drivers/scramble.c
+++ b/src/mame/drivers/scramble.c
@@ -410,30 +410,30 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( triplep_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ay8910_read_port_0_r)
 	AM_RANGE(0x02, 0x02) AM_READ(triplep_pip_r)
 	AM_RANGE(0x03, 0x03) AM_READ(triplep_pap_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( triplep_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( hotshock_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x20, 0x20) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x40, 0x40) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x20, 0x20) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x40, 0x40) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hotshock_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 static WRITE8_HANDLER( scorpion_extra_sound_w )
@@ -453,12 +453,12 @@ static WRITE8_HANDLER( scorpion_sound_cmd_w )
 
 static ADDRESS_MAP_START( scorpion_sound_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x08, 0x08) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x20, 0x20) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x80, 0x80) AM_READWRITE(AY8910_read_port_2_r, AY8910_write_port_2_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x08, 0x08) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x20, 0x20) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x80, 0x80) AM_READWRITE(ay8910_read_port_2_r, ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 static READ8_HANDLER( hncholms_prot_r )
@@ -1839,16 +1839,16 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( scramble_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x20, 0x20) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x80, 0x80) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x20, 0x20) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x80, 0x80) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( scramble_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/scregg.c b/src/mame/drivers/scregg.c
index c9942d0c6f5..39bd79054f1 100644
--- a/src/mame/drivers/scregg.c
+++ b/src/mame/drivers/scregg.c
@@ -88,10 +88,10 @@ static ADDRESS_MAP_START( dommy_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2800, 0x2bff) AM_WRITE(btime_mirrorvideoram_w)
 	AM_RANGE(0x4000, 0x4000) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x4001, 0x4001) AM_WRITE(btime_video_control_w)
-	AM_RANGE(0x4004, 0x4004) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x4005, 0x4005) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4006, 0x4006) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4007, 0x4007) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x4004, 0x4004) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x4005, 0x4005) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4006, 0x4006) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4007, 0x4007) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xa000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
@@ -116,10 +116,10 @@ static ADDRESS_MAP_START( eggs_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1c00, 0x1fff) AM_WRITE(btime_mirrorcolorram_w)
 	AM_RANGE(0x2000, 0x2000) AM_WRITE(btime_video_control_w)
 	AM_RANGE(0x2001, 0x2001) AM_WRITE(SMH_NOP)
-	AM_RANGE(0x2004, 0x2004) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2005, 0x2005) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x2006, 0x2006) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x2007, 0x2007) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x2004, 0x2004) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2005, 0x2005) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x2006, 0x2006) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x2007, 0x2007) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x3000, 0x7fff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/segac2.c b/src/mame/drivers/segac2.c
index 50d26dd664d..bccecc187e3 100644
--- a/src/mame/drivers/segac2.c
+++ b/src/mame/drivers/segac2.c
@@ -182,9 +182,9 @@ static READ16_HANDLER( ym3438_r )
 {
 	switch (offset)
 	{
-		case 0: return YM3438_status_port_0_A_r(machine, 0);
-		case 1: return YM3438_read_port_0_r(machine, 0);
-		case 2: return YM3438_status_port_0_B_r(machine, 0);
+		case 0: return ym3438_status_port_0_a_r(machine, 0);
+		case 1: return ym3438_read_port_0_r(machine, 0);
+		case 2: return ym3438_status_port_0_b_r(machine, 0);
 	}
 	return 0xff;
 }
@@ -207,10 +207,10 @@ static WRITE16_HANDLER( ym3438_w )
 
 		switch (offset)
 		{
-			case 0: YM3438_control_port_0_A_w(machine, 0, data & 0xff);	last_port = data;	break;
-			case 1: YM3438_data_port_0_A_w(machine, 0, data & 0xff);							break;
-			case 2: YM3438_control_port_0_B_w(machine, 0, data & 0xff);	last_port = data;	break;
-			case 3: YM3438_data_port_0_B_w(machine, 0, data & 0xff);							break;
+			case 0: ym3438_control_port_0_a_w(machine, 0, data & 0xff);	last_port = data;	break;
+			case 1: ym3438_data_port_0_a_w(machine, 0, data & 0xff);							break;
+			case 2: ym3438_control_port_0_b_w(machine, 0, data & 0xff);	last_port = data;	break;
+			case 3: ym3438_data_port_0_b_w(machine, 0, data & 0xff);							break;
 		}
 	}
 }
@@ -1342,7 +1342,7 @@ INPUT_PORTS_END
     Sound interfaces
 ******************************************************************************/
 
-static const struct YM3438interface ym3438_intf =
+static const ym3438_interface ym3438_intf =
 {
 	genesis_irq2_interrupt		/* IRQ handler */
 };
diff --git a/src/mame/drivers/segag80v.c b/src/mame/drivers/segag80v.c
index 43ffdb5aeed..9f93feb7bb2 100644
--- a/src/mame/drivers/segag80v.c
+++ b/src/mame/drivers/segag80v.c
@@ -1372,8 +1372,8 @@ static DRIVER_INIT( zektor )
 	has_usb = FALSE;
 	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x38, 0x38, 0, 0, sega_speech_data_w);
 	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3b, 0x3b, 0, 0, sega_speech_control_w);
-	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3c, 0x3c, 0, 0, AY8910_control_port_0_w);
-	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d, 0x3d, 0, 0, AY8910_write_port_0_w);
+	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3c, 0x3c, 0, 0, ay8910_control_port_0_w);
+	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3d, 0x3d, 0, 0, ay8910_write_port_0_w);
 	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3e, 0x3e, 0, 0, zektor1_sh_w);
 	memory_install_write8_handler(machine, 0, ADDRESS_SPACE_IO, 0x3f, 0x3f, 0, 0, zektor2_sh_w);
 
diff --git a/src/mame/drivers/segahang.c b/src/mame/drivers/segahang.c
index 43b6181745d..fbb3b89755a 100644
--- a/src/mame/drivers/segahang.c
+++ b/src/mame/drivers/segahang.c
@@ -433,8 +433,8 @@ static ADDRESS_MAP_START( sound_map_2203, ADDRESS_SPACE_PROGRAM, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x0800) AM_RAM
-	AM_RANGE(0xd000, 0xd000) AM_MIRROR(0x0ffe) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_MIRROR(0x0ffe) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xd000, 0xd000) AM_MIRROR(0x0ffe) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_MIRROR(0x0ffe) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xe000, 0xe0ff) AM_MIRROR(0x0f00) AM_READWRITE(sega_pcm_r, sega_pcm_w)
 ADDRESS_MAP_END
 
@@ -455,19 +455,19 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap_2151, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap_2203x2, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
-	AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3e) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0xc1, 0xc1) AM_MIRROR(0x3e) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3e) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0xc1, 0xc1) AM_MIRROR(0x3e) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c
index 05fedd0ca19..50e7c3c17be 100644
--- a/src/mame/drivers/segaorun.c
+++ b/src/mame/drivers/segaorun.c
@@ -560,8 +560,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/segas16a.c b/src/mame/drivers/segas16a.c
index 8870cc511fb..80296f31575 100644
--- a/src/mame/drivers/segas16a.c
+++ b/src/mame/drivers/segas16a.c
@@ -834,8 +834,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_WRITE(n7751_command_w)
 	AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(sound_data_r)
 ADDRESS_MAP_END
@@ -856,7 +856,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( n7751_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(I8039_bus,I8039_bus) AM_READ(n7751_rom_r)
 	AM_RANGE(I8039_t1, I8039_t1)  AM_READ(n7751_t1_r)
-	AM_RANGE(I8039_p1, I8039_p1)  AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1)  AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2)  AM_READWRITE(n7751_command_r, n7751_busy_w)
 	AM_RANGE(I8039_p4, I8039_p7)  AM_WRITE(n7751_rom_offset_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c
index b3ba4686047..083b934002e 100644
--- a/src/mame/drivers/segas16b.c
+++ b/src/mame/drivers/segas16b.c
@@ -1552,8 +1552,8 @@ static WRITE16_HANDLER( atomicp_sound_w )
 	if (ACCESSING_BITS_8_15)
 		switch (offset & 1)
 		{
-			case 0:	YM2413_register_port_0_w(machine, 0, data >> 8);	break;
-			case 1:	YM2413_data_port_0_w(machine, 0, data >> 8);		break;
+			case 0:	ym2413_register_port_0_w(machine, 0, data >> 8);	break;
+			case 1:	ym2413_data_port_0_w(machine, 0, data >> 8);		break;
 		}
 }
 
@@ -1781,8 +1781,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_WRITE(upd7759_control_w)
 	AM_RANGE(0x80, 0x80) AM_MIRROR(0x3f) AM_READWRITE(upd7759_status_r, upd7759_0_port_w)
 	AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x3f) AM_READ(soundlatch_r)
@@ -3214,7 +3214,7 @@ INPUT_PORTS_END
  *
  *************************************/
 
-static const struct upd7759_interface upd7759_interface =
+static const upd7759_interface upd7759_config =
 {
 	upd7759_generate_nmi
 };
@@ -3271,7 +3271,7 @@ static MACHINE_DRIVER_START( system16b )
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.43)
 
 	MDRV_SOUND_ADD("7759", UPD7759, UPD7759_STANDARD_CLOCK)
-	MDRV_SOUND_CONFIG(upd7759_interface)
+	MDRV_SOUND_CONFIG(upd7759_config)
 	MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.48)
 MACHINE_DRIVER_END
 
diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c
index 3a56460f912..8ac1407a968 100644
--- a/src/mame/drivers/segas18.c
+++ b/src/mame/drivers/segas18.c
@@ -609,14 +609,14 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_MIRROR(0x0c) AM_READWRITE(YM3438_status_port_0_A_r, YM3438_control_port_0_A_w)
-	AM_RANGE(0x81, 0x81) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0x82, 0x82) AM_MIRROR(0x0c) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0x83, 0x83) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_0_B_w)
-	AM_RANGE(0x90, 0x90) AM_MIRROR(0x0c) AM_READWRITE(YM3438_status_port_1_A_r, YM3438_control_port_1_A_w)
-	AM_RANGE(0x91, 0x91) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_1_A_w)
-	AM_RANGE(0x92, 0x92) AM_MIRROR(0x0c) AM_WRITE(YM3438_control_port_1_B_w)
-	AM_RANGE(0x93, 0x93) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_1_B_w)
+	AM_RANGE(0x80, 0x80) AM_MIRROR(0x0c) AM_READWRITE(ym3438_status_port_0_a_r, ym3438_control_port_0_a_w)
+	AM_RANGE(0x81, 0x81) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0x82, 0x82) AM_MIRROR(0x0c) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0x83, 0x83) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_0_b_w)
+	AM_RANGE(0x90, 0x90) AM_MIRROR(0x0c) AM_READWRITE(ym3438_status_port_1_a_r, ym3438_control_port_1_a_w)
+	AM_RANGE(0x91, 0x91) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_1_a_w)
+	AM_RANGE(0x92, 0x92) AM_MIRROR(0x0c) AM_WRITE(ym3438_control_port_1_b_w)
+	AM_RANGE(0x93, 0x93) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_1_b_w)
 	AM_RANGE(0xa0, 0xa0) AM_MIRROR(0x1f) AM_WRITE(soundbank_w)
 	AM_RANGE(0xc0, 0xc0) AM_MIRROR(0x1f) AM_READWRITE(soundlatch_r, mcu_data_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/segas24.c b/src/mame/drivers/segas24.c
index aca027ea606..9e69b74aff4 100644
--- a/src/mame/drivers/segas24.c
+++ b/src/mame/drivers/segas24.c
@@ -594,7 +594,7 @@ static void mahmajn_io_w(running_machine *machine, int port, UINT8 data)
 			cur_input_line = (cur_input_line + 1) & 7;
 		break;
 	case 7: // DAC
-		DAC_0_signed_data_w(machine, 0, data);
+		dac_0_signed_data_w(machine, 0, data);
 		break;
 	default:
 		fprintf(stderr, "Port %d : %02x\n", port, data & 0xff);
@@ -608,7 +608,7 @@ static void hotrod_io_w(running_machine *machine, int port, UINT8 data)
 	case 3: // Lamps
 		break;
 	case 7: // DAC
-		DAC_0_signed_data_w(machine,0, data);
+		dac_0_signed_data_w(machine,0, data);
 		break;
 	default:
 		fprintf(stderr, "Port %d : %02x\n", port, data & 0xff);
@@ -738,19 +738,19 @@ static WRITE16_HANDLER( curbank_w )
 
 static READ16_HANDLER( ym_status_r )
 {
-	return YM2151_status_port_0_r(machine, 0);
+	return ym2151_status_port_0_r(machine, 0);
 }
 
 static WRITE16_HANDLER( ym_register_w )
 {
 	if(ACCESSING_BITS_0_7)
-		YM2151_register_port_0_w(machine, 0, data);
+		ym2151_register_port_0_w(machine, 0, data);
 }
 
 static WRITE16_HANDLER( ym_data_w )
 {
 	if(ACCESSING_BITS_0_7)
-		YM2151_data_port_0_w(machine, 0, data);
+		ym2151_data_port_0_w(machine, 0, data);
 }
 
 
diff --git a/src/mame/drivers/segas32.c b/src/mame/drivers/segas32.c
index 906940efd23..4f2c2cc2203 100644
--- a/src/mame/drivers/segas32.c
+++ b/src/mame/drivers/segas32.c
@@ -1239,14 +1239,14 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( system32_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_MIRROR(0x0c) AM_READWRITE(YM3438_status_port_0_A_r, YM3438_control_port_0_A_w)
-	AM_RANGE(0x81, 0x81) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0x82, 0x82) AM_MIRROR(0x0c) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0x83, 0x83) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_0_B_w)
-	AM_RANGE(0x90, 0x90) AM_MIRROR(0x0c) AM_READWRITE(YM3438_status_port_1_A_r, YM3438_control_port_1_A_w)
-	AM_RANGE(0x91, 0x91) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_1_A_w)
-	AM_RANGE(0x92, 0x92) AM_MIRROR(0x0c) AM_WRITE(YM3438_control_port_1_B_w)
-	AM_RANGE(0x93, 0x93) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_1_B_w)
+	AM_RANGE(0x80, 0x80) AM_MIRROR(0x0c) AM_READWRITE(ym3438_status_port_0_a_r, ym3438_control_port_0_a_w)
+	AM_RANGE(0x81, 0x81) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0x82, 0x82) AM_MIRROR(0x0c) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0x83, 0x83) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_0_b_w)
+	AM_RANGE(0x90, 0x90) AM_MIRROR(0x0c) AM_READWRITE(ym3438_status_port_1_a_r, ym3438_control_port_1_a_w)
+	AM_RANGE(0x91, 0x91) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_1_a_w)
+	AM_RANGE(0x92, 0x92) AM_MIRROR(0x0c) AM_WRITE(ym3438_control_port_1_b_w)
+	AM_RANGE(0x93, 0x93) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_1_b_w)
 	AM_RANGE(0xa0, 0xaf) AM_WRITE(sound_bank_lo_w)
 	AM_RANGE(0xb0, 0xbf) AM_WRITE(sound_bank_hi_w)
 	AM_RANGE(0xc0, 0xcf) AM_WRITE(sound_int_control_lo_w)
@@ -1265,10 +1265,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( multi32_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_MIRROR(0x0c) AM_READWRITE(YM3438_status_port_0_A_r, YM3438_control_port_0_A_w)
-	AM_RANGE(0x81, 0x81) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0x82, 0x82) AM_MIRROR(0x0c) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0x83, 0x83) AM_MIRROR(0x0c) AM_WRITE(YM3438_data_port_0_B_w)
+	AM_RANGE(0x80, 0x80) AM_MIRROR(0x0c) AM_READWRITE(ym3438_status_port_0_a_r, ym3438_control_port_0_a_w)
+	AM_RANGE(0x81, 0x81) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0x82, 0x82) AM_MIRROR(0x0c) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0x83, 0x83) AM_MIRROR(0x0c) AM_WRITE(ym3438_data_port_0_b_w)
 	AM_RANGE(0xa0, 0xaf) AM_WRITE(sound_bank_lo_w)
 	AM_RANGE(0xb0, 0xbf) AM_WRITE(multipcm_bank_w)
 	AM_RANGE(0xc0, 0xcf) AM_WRITE(sound_int_control_lo_w)
@@ -2107,7 +2107,7 @@ GFXDECODE_END
  *
  *************************************/
 
-static const struct YM3438interface ym3438_interface =
+static const ym3438_interface ym3438_config =
 {
 	ym3438_irq_handler
 };
@@ -2183,7 +2183,7 @@ static MACHINE_DRIVER_START( system32 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym1", YM3438, MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ym3438_interface)
+	MDRV_SOUND_CONFIG(ym3438_config)
 	MDRV_SOUND_ROUTE(0, "left", 0.40)
 	MDRV_SOUND_ROUTE(1, "right", 0.40)
 
@@ -2244,7 +2244,7 @@ static MACHINE_DRIVER_START( multi32 )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ym", YM3438, MASTER_CLOCK/4)
-	MDRV_SOUND_CONFIG(ym3438_interface)
+	MDRV_SOUND_CONFIG(ym3438_config)
 	MDRV_SOUND_ROUTE(1, "left", 0.40)
 	MDRV_SOUND_ROUTE(0, "right", 0.40)
 
diff --git a/src/mame/drivers/segaxbd.c b/src/mame/drivers/segaxbd.c
index 37f507145b8..fc86c160598 100644
--- a/src/mame/drivers/segaxbd.c
+++ b/src/mame/drivers/segaxbd.c
@@ -575,8 +575,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/segaybd.c b/src/mame/drivers/segaybd.c
index f0da8b6cdce..0f691496fcc 100644
--- a/src/mame/drivers/segaybd.c
+++ b/src/mame/drivers/segaybd.c
@@ -452,8 +452,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_UNMAP_HIGH
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_MIRROR(0x3e) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_MIRROR(0x3e) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_MIRROR(0x3f) AM_READ(sound_data_r)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c
index 4589a648c3f..14723ab7fbe 100644
--- a/src/mame/drivers/seibuspi.c
+++ b/src/mame/drivers/seibuspi.c
@@ -1044,7 +1044,7 @@ static ADDRESS_MAP_START( spisound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x400b, 0x400b) AM_WRITENOP			/* Unknown */
 	AM_RANGE(0x4013, 0x4013) AM_READ(z80_coin_r)
 	AM_RANGE(0x401b, 0x401b) AM_WRITE(z80_bank_w)		/* control register: bits 0-2 = bank @ 8000, bit 3 = watchdog? */
-	AM_RANGE(0x6000, 0x600f) AM_READWRITE(YMF271_0_r, YMF271_0_w)
+	AM_RANGE(0x6000, 0x600f) AM_READWRITE(ymf271_0_r, ymf271_0_w)
 	AM_RANGE(0x8000, 0xffff) AM_ROMBANK(4)
 ADDRESS_MAP_END
 
@@ -1083,7 +1083,7 @@ static void irqhandler(running_machine *machine, int state)
 		cpunum_set_input_line(machine, 1, 0, CLEAR_LINE);
 }
 
-static const struct YMF271interface ymf271_interface =
+static const ymf271_interface ymf271_config =
 {
 	flashrom_read,
 	flashrom_write,
@@ -1797,7 +1797,7 @@ static MACHINE_DRIVER_START( spi )
 	MDRV_SPEAKER_STANDARD_STEREO("left", "right")
 
 	MDRV_SOUND_ADD("ymf", YMF271, 16934400)
-	MDRV_SOUND_CONFIG(ymf271_interface)
+	MDRV_SOUND_CONFIG(ymf271_config)
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
 MACHINE_DRIVER_END
@@ -1837,7 +1837,7 @@ static MACHINE_DRIVER_START( sxx2g ) /* single board version using measured cloc
 	MDRV_CPU_REPLACE("sound", Z80, 4915200) /* 4.9152MHz */
 
 	MDRV_SOUND_REPLACE("ymf", YMF271, 16384000) /* 16.3840MHz */
-	MDRV_SOUND_CONFIG(ymf271_interface)
+	MDRV_SOUND_CONFIG(ymf271_config)
 
 	MDRV_SOUND_ROUTE(0, "left", 1.0)
 	MDRV_SOUND_ROUTE(1, "right", 1.0)
diff --git a/src/mame/drivers/seicross.c b/src/mame/drivers/seicross.c
index 4dd07244ce9..1084be07b17 100644
--- a/src/mame/drivers/seicross.c
+++ b/src/mame/drivers/seicross.c
@@ -131,19 +131,19 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( main_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x04, 0x04) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x08, 0x08) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0c, 0x0c) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x04, 0x04) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0c, 0x0c) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( mcu_nvram_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x007f) AM_RAM
 	AM_RANGE(0x1000, 0x10ff) AM_RAM AM_BASE(&nvram) AM_SIZE(&nvram_size)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x8000, 0xf7ff) AM_ROM
 	AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE(1)
 ADDRESS_MAP_END
@@ -153,7 +153,7 @@ static ADDRESS_MAP_START( mcu_no_nvram_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1003, 0x1003) AM_READ_PORT("DSW1")		/* DSW1 */
 	AM_RANGE(0x1005, 0x1005) AM_READ_PORT("DSW2")		/* DSW2 */
 	AM_RANGE(0x1006, 0x1006) AM_READ_PORT("DSW3")		/* DSW3 */
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x8000, 0xf7ff) AM_ROM
 	AM_RANGE(0xf800, 0xffff) AM_RAM AM_SHARE(1)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index fa0edfc8942..aa4f4ffa056 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -1415,11 +1415,11 @@ static WRITE16_HANDLER( timer_regs_w )
 
 ***************************************************************************/
 
-static const struct x1_010_interface seta_sound_intf =
+static const x1_010_interface seta_sound_intf =
 {
 	0x0000,		/* address */
 };
-static const struct x1_010_interface seta_sound_intf2 =
+static const x1_010_interface seta_sound_intf2 =
 {
 	0x1000,		/* address */
 };
@@ -1429,7 +1429,7 @@ static void utoukond_ym3438_interrupt(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, linestate);
 }
 
-static const struct YM3438interface utoukond_ym3438_intf =
+static const ym3438_interface utoukond_ym3438_intf =
 {
 	utoukond_ym3438_interrupt	// IRQ handler
 };
@@ -2842,7 +2842,7 @@ static ADDRESS_MAP_START( tndrcade_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1000, 0x1000) AM_READ_PORT("P1")					// P1
 	AM_RANGE(0x1001, 0x1001) AM_READ_PORT("P2")					// P2
 	AM_RANGE(0x1002, 0x1002) AM_READ_PORT("COINS")				// Coins
-	AM_RANGE(0x2001, 0x2001) AM_READ(YM2203_read_port_0_r	)
+	AM_RANGE(0x2001, 0x2001) AM_READ(ym2203_read_port_0_r	)
 	AM_RANGE(0x5000, 0x57ff) AM_READ(SMH_RAM				)	// Shared RAM
 	AM_RANGE(0x6000, 0x7fff) AM_READ(SMH_ROM				)	// ROM
 	AM_RANGE(0x8000, 0xbfff) AM_READ(SMH_BANK1				)	// Banked ROM
@@ -2852,10 +2852,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( tndrcade_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM					)	// RAM
 	AM_RANGE(0x1000, 0x1000) AM_WRITE(sub_bankswitch_lockout_w	)	// ROM Bank + Coin Lockout
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2203_control_port_0_w	)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(YM2203_write_port_0_w		)
-	AM_RANGE(0x3000, 0x3000) AM_WRITE(YM3812_control_port_0_w	)
-	AM_RANGE(0x3001, 0x3001) AM_WRITE(YM3812_write_port_0_w		)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2203_control_port_0_w	)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ym2203_write_port_0_w		)
+	AM_RANGE(0x3000, 0x3000) AM_WRITE(ym3812_control_port_0_w	)
+	AM_RANGE(0x3001, 0x3001) AM_WRITE(ym3812_write_port_0_w		)
 	AM_RANGE(0x5000, 0x57ff) AM_WRITE(SMH_RAM) AM_BASE(&sharedram		)	// Shared RAM
 	AM_RANGE(0x6000, 0xffff) AM_WRITE(SMH_ROM					)	// ROM
 ADDRESS_MAP_END
@@ -3006,15 +3006,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( utoukond_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM3438_status_port_0_A_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym3438_status_port_0_a_r)
 	AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 static ADDRESS_MAP_START( utoukond_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3438_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM3438_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3438_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym3438_data_port_0_b_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(SMH_NOP) //?
 ADDRESS_MAP_END
 
@@ -3076,8 +3076,8 @@ ADDRESS_MAP_END
                             Crazy Fight
 ***************************************************************************/
 
-static WRITE16_HANDLER( YM3812_control_port_0_lsb_w )	{	if (ACCESSING_BITS_0_7)	YM3812_control_port_0_w(machine, 0, data & 0xff);	}
-static WRITE16_HANDLER( YM3812_write_port_0_lsb_w )		{	if (ACCESSING_BITS_0_7)	YM3812_write_port_0_w(machine, 0, data & 0xff);		}
+static WRITE16_HANDLER( YM3812_control_port_0_lsb_w )	{	if (ACCESSING_BITS_0_7)	ym3812_control_port_0_w(machine, 0, data & 0xff);	}
+static WRITE16_HANDLER( YM3812_write_port_0_lsb_w )		{	if (ACCESSING_BITS_0_7)	ym3812_write_port_0_w(machine, 0, data & 0xff);		}
 
 static ADDRESS_MAP_START( crazyfgt_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x000000, 0x07ffff) AM_ROM
diff --git a/src/mame/drivers/seta2.c b/src/mame/drivers/seta2.c
index 1da3e9a7b50..0e4eace92d5 100644
--- a/src/mame/drivers/seta2.c
+++ b/src/mame/drivers/seta2.c
@@ -1801,7 +1801,7 @@ static INTERRUPT_GEN( samshoot_interrupt )
 	}
 }
 
-static const struct x1_010_interface x1_010_sound_intf =
+static const x1_010_interface x1_010_sound_intf =
 {
 	0x0000,		/* address */
 };
diff --git a/src/mame/drivers/sf.c b/src/mame/drivers/sf.c
index d60bb078c5e..a2304e85253 100644
--- a/src/mame/drivers/sf.c
+++ b/src/mame/drivers/sf.c
@@ -254,14 +254,14 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xc800, 0xc800) AM_READ(soundlatch_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2151_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2151_data_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/sgladiat.c b/src/mame/drivers/sgladiat.c
index 5080caf1004..c26aa9b2b9e 100644
--- a/src/mame/drivers/sgladiat.c
+++ b/src/mame/drivers/sgladiat.c
@@ -129,11 +129,11 @@ static ADDRESS_MAP_START( sgladiat_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(sgladiat_soundlatch_r)
 	AM_RANGE(0xc000, 0xc000) AM_READ(sgladiat_sound_nmi_ack_r)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xe002, 0xe003) AM_WRITE(SMH_NOP)	// leftover wave generator ports?
-	AM_RANGE(0xe004, 0xe004) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xe005, 0xe005) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xe004, 0xe004) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xe005, 0xe005) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sgladiat_sound_portmap, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c
index e3efaf160a8..58358ecff38 100644
--- a/src/mame/drivers/shadfrce.c
+++ b/src/mame/drivers/shadfrce.c
@@ -290,7 +290,7 @@ static WRITE8_HANDLER( oki_bankswitch_w )
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xc801, 0xc801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc801, 0xc801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xd800, 0xd800) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
 	AM_RANGE(0xf000, 0xffff) AM_READ(SMH_RAM)
@@ -299,8 +299,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xd800, 0xd800) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0xe800, 0xe800) AM_WRITE(oki_bankswitch_w)
 	AM_RANGE(0xf000, 0xffff) AM_WRITE(SMH_RAM)
diff --git a/src/mame/drivers/shangha3.c b/src/mame/drivers/shangha3.c
index afb713d7e81..e6aaa0f0114 100644
--- a/src/mame/drivers/shangha3.c
+++ b/src/mame/drivers/shangha3.c
@@ -116,7 +116,7 @@ static ADDRESS_MAP_START( shangha3_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x100000, 0x100fff) AM_READ(SMH_RAM)
 	AM_RANGE(0x200000, 0x200001) AM_READ(input_port_0_word_r)
 	AM_RANGE(0x200002, 0x200003) AM_READ(input_port_1_word_r)
-	AM_RANGE(0x20001e, 0x20001f) AM_READ(AY8910_read_port_0_lsb_r)
+	AM_RANGE(0x20001e, 0x20001f) AM_READ(ay8910_read_port_0_lsb_r)
 	AM_RANGE(0x20004e, 0x20004f) AM_READ(shangha3_prot_r)
 	AM_RANGE(0x20006e, 0x20006f) AM_READ(okim6295_status_0_lsb_r)
 	AM_RANGE(0x300000, 0x30ffff) AM_READ(SMH_RAM)
@@ -128,8 +128,8 @@ static ADDRESS_MAP_START( shangha3_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x200008, 0x200009) AM_WRITE(shangha3_blitter_go_w)
 	AM_RANGE(0x20000a, 0x20000b) AM_WRITE(SMH_NOP)	/* irq ack? */
 	AM_RANGE(0x20000c, 0x20000d) AM_WRITE(shangha3_coinctrl_w)
-	AM_RANGE(0x20002e, 0x20002f) AM_WRITE(AY8910_write_port_0_lsb_w)
-	AM_RANGE(0x20003e, 0x20003f) AM_WRITE(AY8910_control_port_0_lsb_w)
+	AM_RANGE(0x20002e, 0x20002f) AM_WRITE(ay8910_write_port_0_lsb_w)
+	AM_RANGE(0x20003e, 0x20003f) AM_WRITE(ay8910_control_port_0_lsb_w)
 	AM_RANGE(0x20004e, 0x20004f) AM_WRITE(shangha3_prot_w)
 	AM_RANGE(0x20006e, 0x20006f) AM_WRITE(okim6295_data_0_lsb_w)
 	AM_RANGE(0x300000, 0x30ffff) AM_WRITE(SMH_RAM) AM_BASE(&shangha3_ram) AM_SIZE(&shangha3_ram_size)	/* gfx & work ram */
@@ -195,17 +195,17 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( heberpop_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM3438_status_port_0_A_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym3438_status_port_0_a_r)
 	AM_RANGE(0x80, 0x80) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( heberpop_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3438_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM3438_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3438_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym3438_data_port_0_b_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
@@ -491,7 +491,7 @@ static void irqhandler(running_machine *machine, int linestate)
 	cpunum_set_input_line(machine, 1, INPUT_LINE_NMI, linestate);
 }
 
-static const struct YM3438interface ym3438_interface =
+static const ym3438_interface ym3438_config =
 {
 	irqhandler
 };
@@ -565,7 +565,7 @@ static MACHINE_DRIVER_START( heberpop )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3438, 8000000)
-	MDRV_SOUND_CONFIG(ym3438_interface)
+	MDRV_SOUND_CONFIG(ym3438_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.40)
 	MDRV_SOUND_ROUTE(1, "mono", 0.40)
 
@@ -607,7 +607,7 @@ static MACHINE_DRIVER_START( blocken )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ym", YM3438, 8000000)
-	MDRV_SOUND_CONFIG(ym3438_interface)
+	MDRV_SOUND_CONFIG(ym3438_config)
 	MDRV_SOUND_ROUTE(0, "mono", 0.40)
 	MDRV_SOUND_ROUTE(1, "mono", 0.40)
 
diff --git a/src/mame/drivers/shanghai.c b/src/mame/drivers/shanghai.c
index 5e452ca8ea9..6e236aadc6d 100644
--- a/src/mame/drivers/shanghai.c
+++ b/src/mame/drivers/shanghai.c
@@ -825,8 +825,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( shanghai_portmap, ADDRESS_SPACE_IO, 16 )
 	AM_RANGE(0x00, 0x01) AM_READWRITE(HD63484_status_r, HD63484_address_w)
 	AM_RANGE(0x02, 0x03) AM_READWRITE(HD63484_data_r, HD63484_data_w)
-	AM_RANGE(0x20, 0x21) AM_READWRITE(YM2203_status_port_0_lsb_r, YM2203_control_port_0_lsb_w)
-	AM_RANGE(0x22, 0x23) AM_READWRITE(YM2203_read_port_0_lsb_r, YM2203_write_port_0_lsb_w)
+	AM_RANGE(0x20, 0x21) AM_READWRITE(ym2203_status_port_0_lsb_r, ym2203_control_port_0_lsb_w)
+	AM_RANGE(0x22, 0x23) AM_READWRITE(ym2203_read_port_0_lsb_r, ym2203_write_port_0_lsb_w)
 	AM_RANGE(0x40, 0x41) AM_READ_PORT("P1")
 	AM_RANGE(0x44, 0x45) AM_READ_PORT("P2")
 	AM_RANGE(0x48, 0x49) AM_READ_PORT("SYSTEM")
@@ -840,8 +840,8 @@ static ADDRESS_MAP_START( shangha2_portmap, ADDRESS_SPACE_IO, 16 )
 	AM_RANGE(0x20, 0x21) AM_READ_PORT("SYSTEM")
 	AM_RANGE(0x30, 0x31) AM_READWRITE(HD63484_status_r, HD63484_address_w)
 	AM_RANGE(0x32, 0x33) AM_READWRITE(HD63484_data_r, HD63484_data_w)
-	AM_RANGE(0x40, 0x41) AM_READWRITE(YM2203_status_port_0_lsb_r, YM2203_control_port_0_lsb_w)
-	AM_RANGE(0x42, 0x43) AM_READWRITE(YM2203_read_port_0_lsb_r, YM2203_write_port_0_lsb_w)
+	AM_RANGE(0x40, 0x41) AM_READWRITE(ym2203_status_port_0_lsb_r, ym2203_control_port_0_lsb_w)
+	AM_RANGE(0x42, 0x43) AM_READWRITE(ym2203_read_port_0_lsb_r, ym2203_write_port_0_lsb_w)
 	AM_RANGE(0x50, 0x51) AM_WRITE(shanghai_coin_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c
index 8654b741f8b..ef94dec7f92 100644
--- a/src/mame/drivers/shangkid.c
+++ b/src/mame/drivers/shangkid.c
@@ -102,7 +102,7 @@ static WRITE8_HANDLER( shangkid_sound_enable_w )
 static WRITE8_HANDLER( shangkid_bbx_AY8910_control_w )
 {
 	bbx_AY8910_control = data;
-	AY8910_control_port_0_w( machine, offset, data );
+	ay8910_control_port_0_w( machine, offset, data );
 }
 
 static WRITE8_HANDLER( chinhero_bbx_AY8910_write_w )
@@ -123,7 +123,7 @@ static WRITE8_HANDLER( chinhero_bbx_AY8910_write_w )
 		break;
 
 	default:
-		AY8910_write_port_0_w( machine, offset, data );
+		ay8910_write_port_0_w( machine, offset, data );
 		break;
 	}
 }
@@ -148,7 +148,7 @@ static WRITE8_HANDLER( shangkid_bbx_AY8910_write_w )
 		break;
 
 	default:
-		AY8910_write_port_0_w( machine, offset, data );
+		ay8910_write_port_0_w( machine, offset, data );
 		break;
 	}
 }
@@ -376,7 +376,7 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(shangkid_soundlatch_r, DAC_0_data_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(shangkid_soundlatch_r, dac_0_data_w)
 ADDRESS_MAP_END
 
 /***************************************************************************************/
@@ -467,8 +467,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( dynamski_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	/* ports are reversed */
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static MACHINE_DRIVER_START( dynamski )
diff --git a/src/mame/drivers/shisen.c b/src/mame/drivers/shisen.c
index 1fec33e28d8..84d86de8b79 100644
--- a/src/mame/drivers/shisen.c
+++ b/src/mame/drivers/shisen.c
@@ -89,15 +89,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)
 	AM_RANGE(0x84, 0x84) AM_READ(m72_sample_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x80, 0x81) AM_WRITE(shisen_sample_addr_w)
 	AM_RANGE(0x82, 0x82) AM_WRITE(m72_sample_w)
 	AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w)
diff --git a/src/mame/drivers/shootout.c b/src/mame/drivers/shootout.c
index cedfb4c1ed9..d611b7991e2 100644
--- a/src/mame/drivers/shootout.c
+++ b/src/mame/drivers/shootout.c
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( readmem_alt, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1002, 0x1002) AM_READ(input_port_2_r)
 	AM_RANGE(0x1003, 0x1003) AM_READ(input_port_3_r)
 	AM_RANGE(0x2000, 0x21ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x2800, 0x2800) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x2800, 0x2800) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0x3000, 0x37ff) AM_READ(SMH_RAM)	/* foreground */
 	AM_RANGE(0x3800, 0x3fff) AM_READ(SMH_RAM)	/* background */
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
@@ -119,8 +119,8 @@ static ADDRESS_MAP_START( writemem_alt, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x1800, 0x1800) AM_WRITE(shootout_coin_counter_w)
 	AM_RANGE(0x2000, 0x21ff) AM_WRITE(SMH_RAM) AM_BASE(&spriteram) AM_SIZE(&spriteram_size)
-	AM_RANGE(0x2800, 0x2800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x2801, 0x2801) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x2800, 0x2800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x2801, 0x2801) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x3000, 0x37ff) AM_WRITE(shootout_textram_w) AM_BASE(&shootout_textram)
 	AM_RANGE(0x3800, 0x3fff) AM_WRITE(shootout_videoram_w) AM_BASE(&videoram)
 	AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM)
@@ -130,15 +130,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x4000, 0x4000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x4000, 0x4000) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xc000, 0xffff) AM_READ(SMH_ROM)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(interrupt_enable_w)
 	AM_RANGE(0xc000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/shougi.c b/src/mame/drivers/shougi.c
index 93f5738495d..5b448790bf6 100644
--- a/src/mame/drivers/shougi.c
+++ b/src/mame/drivers/shougi.c
@@ -277,8 +277,8 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
 
 	AM_RANGE(0x5000, 0x5000) AM_READ(input_port_0_r)
 	AM_RANGE(0x5800, 0x5800) AM_READ(input_port_1_r) AM_WRITE(shougi_watchdog_reset_w)	/* game won't boot if watchdog doesn't work */
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x6800, 0x6800) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x6800, 0x6800) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x7000, 0x73ff) AM_RAM AM_SHARE(1) /* 2114 x 2 (0x400 x 4bit each) */
 	AM_RANGE(0x7800, 0x7bff) AM_RAM AM_SHARE(2) /* 2114 x 2 (0x400 x 4bit each) */
 
diff --git a/src/mame/drivers/sidearms.c b/src/mame/drivers/sidearms.c
index a4cb88fb91f..77ca718e81d 100644
--- a/src/mame/drivers/sidearms.c
+++ b/src/mame/drivers/sidearms.c
@@ -148,17 +148,17 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
-	AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xf002, 0xf002) AM_READ(YM2203_status_port_1_r)
+	AM_RANGE(0xf000, 0xf000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xf002, 0xf002) AM_READ(ym2203_status_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xf002, 0xf002) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xf003, 0xf003) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xf002, 0xf002) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xf003, 0xf003) AM_WRITE(ym2203_write_port_1_w)
 ADDRESS_MAP_END
 
 /* Whizz */
@@ -228,14 +228,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( whizz_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( whizz_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/sidepckt.c b/src/mame/drivers/sidepckt.c
index 0586e2822d2..323fe713a0e 100644
--- a/src/mame/drivers/sidepckt.c
+++ b/src/mame/drivers/sidepckt.c
@@ -168,10 +168,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
     AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM)
-    AM_RANGE(0x1000, 0x1000) AM_WRITE(YM2203_control_port_0_w)
-    AM_RANGE(0x1001, 0x1001) AM_WRITE(YM2203_write_port_0_w)
-    AM_RANGE(0x2000, 0x2000) AM_WRITE(YM3526_control_port_0_w)
-    AM_RANGE(0x2001, 0x2001) AM_WRITE(YM3526_write_port_0_w)
+    AM_RANGE(0x1000, 0x1000) AM_WRITE(ym2203_control_port_0_w)
+    AM_RANGE(0x1001, 0x1001) AM_WRITE(ym2203_write_port_0_w)
+    AM_RANGE(0x2000, 0x2000) AM_WRITE(ym3526_control_port_0_w)
+    AM_RANGE(0x2001, 0x2001) AM_WRITE(ym3526_write_port_0_w)
     AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c
index 2ff45c78571..6143521d3a6 100644
--- a/src/mame/drivers/silkroad.c
+++ b/src/mame/drivers/silkroad.c
@@ -188,14 +188,14 @@ static WRITE32_HANDLER(silk_6295_1_w)
 
 static READ32_HANDLER(silk_ym_r)
 {
-	return YM2151_status_port_0_r(machine, 0)<<16;
+	return ym2151_status_port_0_r(machine, 0)<<16;
 }
 
 static WRITE32_HANDLER(silk_ym_regport_w)
 {
 	if (ACCESSING_BITS_16_23)
 	{
-		YM2151_register_port_0_w(machine, 0, (data>>16) & 0xff);
+		ym2151_register_port_0_w(machine, 0, (data>>16) & 0xff);
 	}
 }
 
@@ -203,7 +203,7 @@ static WRITE32_HANDLER(silk_ym_dataport_w)
 {
 	if (ACCESSING_BITS_16_23)
 	{
-		YM2151_data_port_0_w(machine, 0, (data>>16) & 0xff);
+		ym2151_data_port_0_w(machine, 0, (data>>16) & 0xff);
 	}
 }
 
diff --git a/src/mame/drivers/simpsons.c b/src/mame/drivers/simpsons.c
index d10a3215290..d354c58099d 100644
--- a/src/mame/drivers/simpsons.c
+++ b/src/mame/drivers/simpsons.c
@@ -78,8 +78,8 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(2)
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w)
 	AM_RANGE(0xfc00, 0xfc2f) AM_READWRITE(k053260_0_r, k053260_0_w)
 	AM_RANGE(0xfe00, 0xfe00) AM_WRITE(z80_bankswitch_w)
diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c
index 19e27d864c4..e9e5db1cb5c 100644
--- a/src/mame/drivers/skyarmy.c
+++ b/src/mame/drivers/skyarmy.c
@@ -250,13 +250,13 @@ GFXDECODE_END
 
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x06, 0x06) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x06, 0x06) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static MACHINE_DRIVER_START( skyarmy )
diff --git a/src/mame/drivers/skyfox.c b/src/mame/drivers/skyfox.c
index 9c7916be9d8..28a63709d3d 100644
--- a/src/mame/drivers/skyfox.c
+++ b/src/mame/drivers/skyfox.c
@@ -87,8 +87,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( skyfox_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM				)	// ROM
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM				)	// RAM
-	AM_RANGE(0xa001, 0xa001) AM_READ(YM2203_read_port_0_r 	)	// YM2203 #1
-//  AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_1_r   )   // YM2203 #2
+	AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_read_port_0_r 	)	// YM2203 #1
+//  AM_RANGE(0xc001, 0xc001) AM_READ(ym2203_read_port_1_r   )   // YM2203 #2
 	AM_RANGE(0xb000, 0xb000) AM_READ(soundlatch_r			)	// From Main CPU
 ADDRESS_MAP_END
 
@@ -96,11 +96,11 @@ static ADDRESS_MAP_START( skyfox_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM					)	// ROM
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM					)	// RAM
 //  AM_RANGE(0x9000, 0x9001) AM_WRITE(SMH_NOP                  )   // ??
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w 	)	// YM2203 #1
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w 	)	//
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w 	)	// YM2203 #1
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w 	)	//
 //  AM_RANGE(0xb000, 0xb001) AM_WRITE(SMH_NOP                  )   // ??
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_1_w 	)	// YM2203 #2
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_1_w 	)	//
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2203_control_port_1_w 	)	// YM2203 #2
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2203_write_port_1_w 	)	//
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/skylncr.c b/src/mame/drivers/skylncr.c
index ad14b54b410..c0f2a801403 100644
--- a/src/mame/drivers/skylncr.c
+++ b/src/mame/drivers/skylncr.c
@@ -182,8 +182,8 @@ static ADDRESS_MAP_START( io_map_skylncr, ADDRESS_SPACE_IO, 8 )
 
 	AM_RANGE(0x20, 0x20) AM_WRITE( skylncr_coin_w )
 
-	AM_RANGE(0x30, 0x30) AM_WRITE( AY8910_control_port_0_w )
-	AM_RANGE(0x31, 0x31) AM_READWRITE( AY8910_read_port_0_r , AY8910_write_port_0_w )
+	AM_RANGE(0x30, 0x30) AM_WRITE( ay8910_control_port_0_w )
+	AM_RANGE(0x31, 0x31) AM_READWRITE( ay8910_read_port_0_r , ay8910_write_port_0_w )
 
 	AM_RANGE(0x40, 0x41) AM_WRITE( skylncr_paletteram_w )
 	AM_RANGE(0x50, 0x51) AM_WRITE( skylncr_paletteram2_w )
diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c
index 695223c0c05..b97be9b4c3b 100644
--- a/src/mame/drivers/slapfght.c
+++ b/src/mame/drivers/slapfght.c
@@ -561,26 +561,26 @@ static ADDRESS_MAP_START( perfrman_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8800, 0x880f) AM_READ(slapfight_dpram_r)
 	AM_RANGE(0x8810, 0x8fff) AM_READ(SMH_BANK1)
-	AM_RANGE(0xa081, 0xa081) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa091, 0xa091) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0xa081, 0xa081) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa091, 0xa091) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( perfrman_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8800, 0x880f) AM_WRITE(slapfight_dpram_w)
 	AM_RANGE(0x8810, 0x8fff) AM_WRITE(SMH_BANK1)	/* Shared RAM with main CPU */
-	AM_RANGE(0xa080, 0xa080) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa082, 0xa082) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xa090, 0xa090) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xa092, 0xa092) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xa080, 0xa080) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa082, 0xa082) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xa090, 0xa090) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xa092, 0xa092) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */
 //  AM_RANGE(0xa0f0, 0xa0f0) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_READ(SMH_ROM)
-	AM_RANGE(0xa081, 0xa081) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xa091, 0xa091) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0xa081, 0xa081) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xa091, 0xa091) AM_READ(ay8910_read_port_1_r)
 	AM_RANGE(0xc800, 0xc80f) AM_READ(slapfight_dpram_r)
 	AM_RANGE(0xc810, 0xcfff) AM_READ(SMH_RAM)
 	AM_RANGE(0xd000, 0xffff) AM_READ(SMH_RAM)
@@ -588,10 +588,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xa080, 0xa080) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xa082, 0xa082) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xa090, 0xa090) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xa092, 0xa092) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0xa080, 0xa080) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xa082, 0xa082) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xa090, 0xa090) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xa092, 0xa092) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xa0e0, 0xa0e0) AM_WRITE(getstar_sh_intenable_w) /* maybe a0f0 also -LE */
 	AM_RANGE(0xc800, 0xc80f) AM_WRITE(slapfight_dpram_w)
 	AM_RANGE(0xc810, 0xcfff) AM_WRITE(SMH_RAM)
diff --git a/src/mame/drivers/slapshot.c b/src/mame/drivers/slapshot.c
index 1cee6bf9ed1..7ecce1c87b1 100644
--- a/src/mame/drivers/slapshot.c
+++ b/src/mame/drivers/slapshot.c
@@ -340,9 +340,9 @@ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -351,10 +351,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c
index 5124045f3f2..0d5130e2900 100644
--- a/src/mame/drivers/snk.c
+++ b/src/mame/drivers/snk.c
@@ -403,8 +403,8 @@ static ADDRESS_MAP_START( YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xc000, 0xc000) AM_READ(snk_soundlatch_clear_r)
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM3526_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym3526_write_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -412,10 +412,10 @@ static ADDRESS_MAP_START( YM3526_YM3526_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xcfff) AM_RAM
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
-	AM_RANGE(0xe800, 0xe800) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3526_write_port_0_w)
-	AM_RANGE(0xf000, 0xf000) AM_READWRITE(YM3526_status_port_1_r, YM3526_control_port_1_w)
-	AM_RANGE(0xf400, 0xf400) AM_WRITE(YM3526_write_port_1_w)
+	AM_RANGE(0xe800, 0xe800) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym3526_write_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_READWRITE(ym3526_status_port_1_r, ym3526_control_port_1_w)
+	AM_RANGE(0xf400, 0xf400) AM_WRITE(ym3526_write_port_1_w)
 	AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_register_r, snk_sound_register_w)
 ADDRESS_MAP_END
 
@@ -424,10 +424,10 @@ static ADDRESS_MAP_START( YM3526_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xcfff) AM_RAM
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
-	AM_RANGE(0xe800, 0xe800) AM_READWRITE(YM3526_status_port_0_r, YM3526_control_port_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3526_write_port_0_w)
-	AM_RANGE(0xf000, 0xf000) AM_READWRITE(Y8950_status_port_0_r, Y8950_control_port_0_w)
-	AM_RANGE(0xf400, 0xf400) AM_WRITE(Y8950_write_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_READWRITE(ym3526_status_port_0_r, ym3526_control_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym3526_write_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_READWRITE(y8950_status_port_0_r, y8950_control_port_0_w)
+	AM_RANGE(0xf400, 0xf400) AM_WRITE(y8950_write_port_0_w)
 	AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_register_r, snk_sound_register_w)
 ADDRESS_MAP_END
 
@@ -436,10 +436,10 @@ static ADDRESS_MAP_START( YM3812_Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xcfff) AM_RAM
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
-	AM_RANGE(0xe800, 0xe800) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3812_write_port_0_w)
-	AM_RANGE(0xf000, 0xf000) AM_READWRITE(Y8950_status_port_0_r, Y8950_control_port_0_w)
-	AM_RANGE(0xf400, 0xf400) AM_WRITE(Y8950_write_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym3812_write_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_READWRITE(y8950_status_port_0_r, y8950_control_port_0_w)
+	AM_RANGE(0xf400, 0xf400) AM_WRITE(y8950_write_port_0_w)
 	AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_register_r, snk_sound_register_w)
 ADDRESS_MAP_END
 
@@ -448,8 +448,8 @@ static ADDRESS_MAP_START( Y8950_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xcfff) AM_RAM
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
-	AM_RANGE(0xf000, 0xf000) AM_READWRITE(Y8950_status_port_0_r, Y8950_control_port_0_w)
-	AM_RANGE(0xf400, 0xf400) AM_WRITE(Y8950_write_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_READWRITE(y8950_status_port_0_r, y8950_control_port_0_w)
+	AM_RANGE(0xf400, 0xf400) AM_WRITE(y8950_write_port_0_w)
 	AM_RANGE(0xf800, 0xf800) AM_READWRITE(snk_sound_register_r, snk_sound_register_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c
index bf9bea85971..1f373816c9f 100644
--- a/src/mame/drivers/snk68.c
+++ b/src/mame/drivers/snk68.c
@@ -181,8 +181,8 @@ static WRITE8_HANDLER( D7759_write_port_0_w )
 
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(D7759_write_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(upd7759_0_reset_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/snowbros.c b/src/mame/drivers/snowbros.c
index 71434606c08..89b7ac755d4 100644
--- a/src/mame/drivers/snowbros.c
+++ b/src/mame/drivers/snowbros.c
@@ -196,14 +196,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0x02, 0x02) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(soundlatch_w)	/* goes back to the main CPU, checked during boot */
 ADDRESS_MAP_END
 
@@ -272,14 +272,14 @@ static ADDRESS_MAP_START( honeydol_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 
 static ADDRESS_MAP_START( honeydol_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_READ(YM3812_status_port_0_r) // not connected?
+	AM_RANGE(0x02, 0x02) AM_READ(ym3812_status_port_0_r) // not connected?
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( honeydol_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YM3812_control_port_0_w) // not connected?
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM3812_write_port_0_w) // not connected?
+	AM_RANGE(0x02, 0x02) AM_WRITE(ym3812_control_port_0_w) // not connected?
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym3812_write_port_0_w) // not connected?
 	AM_RANGE(0x04, 0x04) AM_WRITE(soundlatch_w)	/* goes back to the main CPU, checked during boot */
 ADDRESS_MAP_END
 
@@ -389,15 +389,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( hyperpac_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xcfff) AM_READ(SMH_ROM)
 	AM_RANGE(0xd000, 0xd7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xf001, 0xf001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xf001, 0xf001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hyperpac_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xcfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xd000, 0xd7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xf002, 0xf002) AM_WRITE(okim6295_data_0_w)
 //  AM_RANGE(0xf006, 0xf006) ???
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/solomon.c b/src/mame/drivers/solomon.c
index 26c67ab27b4..755459d1da5 100644
--- a/src/mame/drivers/solomon.c
+++ b/src/mame/drivers/solomon.c
@@ -80,12 +80,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x11, 0x11) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x20, 0x20) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x21, 0x21) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x30, 0x30) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x31, 0x31) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x11, 0x11) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x20, 0x20) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x21, 0x21) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x30, 0x30) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x31, 0x31) AM_WRITE(ay8910_write_port_2_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/sonson.c b/src/mame/drivers/sonson.c
index 2682a14b0bf..c5691dd4d6f 100644
--- a/src/mame/drivers/sonson.c
+++ b/src/mame/drivers/sonson.c
@@ -99,10 +99,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xe000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 195888e0412..02dbcc073b8 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -227,7 +227,7 @@ ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( spacefb_audio_io_map, ADDRESS_SPACE_IO, 8 )
-	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(I8039_p1, I8039_p1) AM_WRITE(dac_0_data_w)
 	AM_RANGE(I8039_p2, I8039_p2) AM_READ(spacefb_audio_p2_r)
 	AM_RANGE(I8039_t0, I8039_t0) AM_READ(spacefb_audio_t0_r)
 	AM_RANGE(I8039_t1, I8039_t1) AM_READ(spacefb_audio_t1_r)
diff --git a/src/mame/drivers/spbactn.c b/src/mame/drivers/spbactn.c
index 5118c942726..030bff53f02 100644
--- a/src/mame/drivers/spbactn.c
+++ b/src/mame/drivers/spbactn.c
@@ -210,8 +210,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xf800, 0xf800) AM_WRITE(okim6295_data_0_w)
-	AM_RANGE(0xf810, 0xf810) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xf811, 0xf811) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xf810, 0xf810) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xf811, 0xf811) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP)	/* irq ack ?? */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/spdodgeb.c b/src/mame/drivers/spdodgeb.c
index d84175cfeea..774babc31b9 100644
--- a/src/mame/drivers/spdodgeb.c
+++ b/src/mame/drivers/spdodgeb.c
@@ -298,8 +298,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x0fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2800, 0x2800) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x2801, 0x2801) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x2800, 0x2800) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x2801, 0x2801) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x3800, 0x3807) AM_WRITE(spd_adpcm_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/speedatk.c b/src/mame/drivers/speedatk.c
index e99c571f867..7319c61890f 100644
--- a/src/mame/drivers/speedatk.c
+++ b/src/mame/drivers/speedatk.c
@@ -181,8 +181,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x01, 0x01) AM_WRITE(speedatk_flip_screen_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( speedatk )
diff --git a/src/mame/drivers/speedbal.c b/src/mame/drivers/speedbal.c
index c1d4c41642f..3f6ac5e0d47 100644
--- a/src/mame/drivers/speedbal.c
+++ b/src/mame/drivers/speedbal.c
@@ -100,8 +100,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_cpu_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_WRITENOP
 	AM_RANGE(0x80, 0x80) AM_WRITENOP
 	AM_RANGE(0x82, 0x82) AM_WRITENOP
diff --git a/src/mame/drivers/splash.c b/src/mame/drivers/splash.c
index e71e39aeff6..ff966612733 100644
--- a/src/mame/drivers/splash.c
+++ b/src/mame/drivers/splash.c
@@ -133,7 +133,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( splash_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xd7ff) AM_READ(SMH_ROM)					/* ROM */
 	AM_RANGE(0xe800, 0xe800) AM_READ(soundlatch_r)				/* Sound latch */
-	AM_RANGE(0xf000, 0xf000) AM_READ(YM3812_status_port_0_r)		/* YM3812 */
+	AM_RANGE(0xf000, 0xf000) AM_READ(ym3812_status_port_0_r)		/* YM3812 */
 	AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)					/* RAM */
 ADDRESS_MAP_END
 
@@ -154,8 +154,8 @@ static ADDRESS_MAP_START( splash_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xd7ff) AM_WRITE(SMH_ROM)					/* ROM */
 	AM_RANGE(0xd800, 0xd800) AM_WRITE(splash_adpcm_data_w)		/* ADPCM data for the MSM5205 chip */
 //  AM_RANGE(0xe000, 0xe000) AM_WRITE(SMH_NOP)                 /* ??? */
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM3812_control_port_0_w)	/* YM3812 */
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM3812_write_port_0_w)		/* YM3812 */
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym3812_control_port_0_w)	/* YM3812 */
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym3812_write_port_0_w)		/* YM3812 */
 	AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM)					/* RAM */
 ADDRESS_MAP_END
 
@@ -214,8 +214,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( roldf_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x12, 0x12) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x13, 0x13) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x12, 0x12) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x13, 0x13) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_NOP	/* NMI ack */
 	AM_RANGE(0x70, 0x70) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/spy.c b/src/mame/drivers/spy.c
index ff7d705ae2a..dd96affcc90 100644
--- a/src/mame/drivers/spy.c
+++ b/src/mame/drivers/spy.c
@@ -381,7 +381,7 @@ static ADDRESS_MAP_START( spy_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa00d) AM_READ(k007232_read_port_0_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_1_r)
-	AM_RANGE(0xc000, 0xc000) AM_READ(YM3812_status_port_0_r)
+	AM_RANGE(0xc000, 0xc000) AM_READ(ym3812_status_port_0_r)
 	AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
@@ -391,8 +391,8 @@ static ADDRESS_MAP_START( spy_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9000, 0x9000) AM_WRITE(sound_bank_w)
 	AM_RANGE(0xa000, 0xa00d) AM_WRITE(k007232_write_port_0_w)
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_1_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/srmp2.c b/src/mame/drivers/srmp2.c
index 6df1fb20c7a..bdf7719a35d 100644
--- a/src/mame/drivers/srmp2.c
+++ b/src/mame/drivers/srmp2.c
@@ -394,7 +394,7 @@ static ADDRESS_MAP_START( srmp2_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_input_2_r)		/* I/O port 2 */
 	AM_RANGE(0xb00000, 0xb00001) AM_READ(srmp2_cchip_status_0_r)	/* Custom chip status ??? */
 	AM_RANGE(0xb00002, 0xb00003) AM_READ(srmp2_cchip_status_1_r)	/* Custom chip status ??? */
-	AM_RANGE(0xf00000, 0xf00001) AM_READ(AY8910_read_port_0_lsb_r)
+	AM_RANGE(0xf00000, 0xf00001) AM_READ(ay8910_read_port_0_lsb_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( srmp2_writemem, ADDRESS_SPACE_PROGRAM, 16 )
@@ -411,8 +411,8 @@ static ADDRESS_MAP_START( srmp2_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP)					/* ??? */
 	AM_RANGE(0xd00000, 0xd00001) AM_WRITE(SMH_NOP)					/* ??? */
 	AM_RANGE(0xe00000, 0xe00001) AM_WRITE(SMH_NOP)					/* ??? */
-	AM_RANGE(0xf00000, 0xf00001) AM_WRITE(AY8910_control_port_0_lsb_w)
-	AM_RANGE(0xf00002, 0xf00003) AM_WRITE(AY8910_write_port_0_lsb_w)
+	AM_RANGE(0xf00000, 0xf00001) AM_WRITE(ay8910_control_port_0_lsb_w)
+	AM_RANGE(0xf00002, 0xf00003) AM_WRITE(ay8910_write_port_0_lsb_w)
 ADDRESS_MAP_END
 
 
@@ -430,7 +430,7 @@ static ADDRESS_MAP_START( mjyuugi_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x900002, 0x900003) AM_READ(srmp2_input_2_r)		/* I/O port 2 */
 	AM_RANGE(0xa00000, 0xa00001) AM_READ(srmp2_cchip_status_0_r)	/* custom chip status ??? */
 	AM_RANGE(0xa00002, 0xa00003) AM_READ(srmp2_cchip_status_1_r)	/* custom chip status ??? */
-	AM_RANGE(0xb00000, 0xb00001) AM_READ(AY8910_read_port_0_lsb_r)
+	AM_RANGE(0xb00000, 0xb00001) AM_READ(ay8910_read_port_0_lsb_r)
 	AM_RANGE(0xd00000, 0xd00609) AM_READ(SMH_RAM)				/* Sprites Y */
 	AM_RANGE(0xd02000, 0xd023ff) AM_READ(SMH_RAM)				/* ??? */
 	AM_RANGE(0xe00000, 0xe03fff) AM_READ(SMH_RAM)				/* Sprites Code + X + Attr */
@@ -445,8 +445,8 @@ static ADDRESS_MAP_START( mjyuugi_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x900000, 0x900001) AM_WRITE(srmp2_input_1_w)			/* I/O ??? */
 	AM_RANGE(0x900002, 0x900003) AM_WRITE(srmp2_input_2_w)			/* I/O ??? */
 	AM_RANGE(0xa00000, 0xa00001) AM_WRITE(srmp2_adpcm_code_w)			/* ADPCM number */
-	AM_RANGE(0xb00000, 0xb00001) AM_WRITE(AY8910_control_port_0_lsb_w)
-	AM_RANGE(0xb00002, 0xb00003) AM_WRITE(AY8910_write_port_0_lsb_w)
+	AM_RANGE(0xb00000, 0xb00001) AM_WRITE(ay8910_control_port_0_lsb_w)
+	AM_RANGE(0xb00002, 0xb00003) AM_WRITE(ay8910_write_port_0_lsb_w)
 	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(SMH_NOP)					/* ??? */
 	AM_RANGE(0xd00000, 0xd00609) AM_WRITE(SMH_RAM) AM_BASE(&spriteram16)	/* Sprites Y */
 	AM_RANGE(0xd02000, 0xd023ff) AM_WRITE(SMH_RAM)					/* ??? only writes $00fa */
@@ -588,7 +588,7 @@ static ADDRESS_MAP_START( srmp3_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0xa1, 0xa1) AM_READ(srmp3_cchip_status_0_r)				/* custom chip status ??? */
 	AM_RANGE(0xc0, 0xc0) AM_READ(srmp3_input_r)						/* key matrix */
 	AM_RANGE(0xc1, 0xc1) AM_READ(srmp3_cchip_status_1_r)				/* custom chip status ??? */
-	AM_RANGE(0xe2, 0xe2) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xe2, 0xe2) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( srmp3_writeport, ADDRESS_SPACE_IO, 8 )
@@ -599,8 +599,8 @@ static ADDRESS_MAP_START( srmp3_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(srmp3_adpcm_code_w)					/* ADPCM number */
 	AM_RANGE(0xc0, 0xc0) AM_WRITE(srmp3_input_1_w)					/* I/O ??? */
 	AM_RANGE(0xc1, 0xc1) AM_WRITE(srmp3_input_2_w)					/* I/O ??? */
-	AM_RANGE(0xe0, 0xe0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xe1, 0xe1) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xe0, 0xe0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xe1, 0xe1) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/srumbler.c b/src/mame/drivers/srumbler.c
index 11b667ac9b6..08900d73df9 100644
--- a/src/mame/drivers/srumbler.c
+++ b/src/mame/drivers/srumbler.c
@@ -118,10 +118,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/sshangha.c b/src/mame/drivers/sshangha.c
index 8b46877f5e8..c18b89cc2b4 100644
--- a/src/mame/drivers/sshangha.c
+++ b/src/mame/drivers/sshangha.c
@@ -187,15 +187,15 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
-	AM_RANGE(0xc000, 0xc000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0xc000, 0xc000) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
 //  AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/ssingles.c b/src/mame/drivers/ssingles.c
index fb4ca1320e1..c8577fe1a51 100644
--- a/src/mame/drivers/ssingles.c
+++ b/src/mame/drivers/ssingles.c
@@ -172,11 +172,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( ssingles_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x06, 0x06) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x06, 0x06) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x08, 0x08) AM_READNOP
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x16, 0x16) AM_READ_PORT("DSW0")
 	AM_RANGE(0x18, 0x18) AM_READ_PORT("DSW1")
 	AM_RANGE(0x1c, 0x1c) AM_READ(controls_r)
diff --git a/src/mame/drivers/ssozumo.c b/src/mame/drivers/ssozumo.c
index 3823874ca8c..a456737dea2 100644
--- a/src/mame/drivers/ssozumo.c
+++ b/src/mame/drivers/ssozumo.c
@@ -101,11 +101,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2002, 0x2002) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x2003, 0x2003) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x2004, 0x2004) AM_WRITE(DAC_0_signed_data_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2002, 0x2002) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x2003, 0x2003) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x2004, 0x2004) AM_WRITE(dac_0_signed_data_w)
 	AM_RANGE(0x2005, 0x2005) AM_WRITE(interrupt_enable_w)
 	AM_RANGE(0x4000, 0xffff) AM_WRITE(SMH_ROM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ssrj.c b/src/mame/drivers/ssrj.c
index 5b6df9c0c45..156c4111a6d 100644
--- a/src/mame/drivers/ssrj.c
+++ b/src/mame/drivers/ssrj.c
@@ -73,7 +73,7 @@ static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xf000, 0xf000) AM_READ_PORT("IN0")
 	AM_RANGE(0xf001, 0xf001) AM_READ(ssrj_wheel_r)
 	AM_RANGE(0xf002, 0xf002) AM_READ_PORT("IN2")
-	AM_RANGE(0xf401, 0xf401) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0xf401, 0xf401) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -85,8 +85,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe800, 0xefff) AM_WRITE(SMH_RAM) AM_BASE(&ssrj_scrollram)
 	AM_RANGE(0xf003, 0xf003) AM_WRITE(SMH_NOP) /* unknown */
-	AM_RANGE(0xf401, 0xf401) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xf400, 0xf400) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0xf401, 0xf401) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xf400, 0xf400) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(SMH_NOP) /* unknown */
 	AM_RANGE(0xf800, 0xf800) AM_WRITE(SMH_NOP) /* wheel ? */
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c
index e4d2ce2aa5a..682752d9e34 100644
--- a/src/mame/drivers/ssv.c
+++ b/src/mame/drivers/ssv.c
@@ -433,7 +433,7 @@ static READ16_HANDLER( fake_r )   {   return ssv_scroll[offset];  }
 	AM_RANGE(0x21000a, 0x21000b) AM_READ(input_port_3_word_r	)	/*  P2      */	\
 	AM_RANGE(0x21000c, 0x21000d) AM_READ(input_port_4_word_r	)	/*  Coins   */	\
 	AM_RANGE(0x21000e, 0x21000f) AM_READ(SMH_NOP				)	/*          */	\
-	AM_RANGE(0x300000, 0x30007f) AM_READ(ES5506_data_0_word_r	)	/*  Sound   */	\
+	AM_RANGE(0x300000, 0x30007f) AM_READ(es5506_data_0_word_r	)	/*  Sound   */	\
 	AM_RANGE(0x482000, 0x482fff) AM_RAM_WRITE(dsp_w) AM_BASE(&dsp_ram)   \
 	AM_RANGE(_ROM, 0xffffff) AM_READ(SMH_BANK1			)	/*  ROM     */	    \
 //AM_RANGE(0x990000, 0x99007f) AM_READ(fake_r)
@@ -449,7 +449,7 @@ static READ16_HANDLER( fake_r )   {   return ssv_scroll[offset];  }
 	AM_RANGE(0x230000, 0x230071) AM_WRITE(SMH_RAM) AM_BASE(&ssv_irq_vectors)	          /* IRQ Vectors */ \
 	AM_RANGE(0x240000, 0x240071) AM_WRITE(ssv_irq_ack_w )                                 /* IRQ Ack */     \
 	AM_RANGE(0x260000, 0x260001) AM_WRITE(ssv_irq_enable_w)                               /* IRQ Enable */  \
-	AM_RANGE(0x300000, 0x30007f) AM_WRITE(ES5506_data_0_word_w)                           /* Sound */       \
+	AM_RANGE(0x300000, 0x30007f) AM_WRITE(es5506_data_0_word_w)                           /* Sound */       \
 //AM_RANGE(0x990000, 0x99007f) AM_WRITE(ssv_scroll_w)
 
 
@@ -835,7 +835,7 @@ static WRITE16_HANDLER( srmp7_sound_bank_w )
 		int bank = 0x400000/2 * (data & 1);	// UINT16 address
 		int voice;
 		for (voice = 0; voice < 32; voice++)
-			ES5506_voice_bank_0_w(voice, bank);
+			es5506_voice_bank_0_w(voice, bank);
 	}
 //  popmessage("%04X",data);
 }
diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c
index a2ae75479fe..7f1fd6ee339 100644
--- a/src/mame/drivers/stadhero.c
+++ b/src/mame/drivers/stadhero.c
@@ -81,10 +81,10 @@ static WRITE8_HANDLER( YM3812_w )
 {
 	switch (offset) {
 	case 0:
-		YM3812_control_port_0_w(machine,0,data);
+		ym3812_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM3812_write_port_0_w(machine,0,data);
+		ym3812_write_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -93,10 +93,10 @@ static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
 	case 0:
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 		break;
 	}
 }
diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c
index 56063d33026..43bdbaa02da 100644
--- a/src/mame/drivers/statriv2.c
+++ b/src/mame/drivers/statriv2.c
@@ -328,7 +328,7 @@ static ADDRESS_MAP_START( statriv2_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(input_port_0_r)
 	AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r)
 	AM_RANGE(0x2b, 0x2b) AM_READ(statriv2_questions_read)		// question data
-	AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r)		// ???
+	AM_RANGE(0xb1, 0xb1) AM_READ(ay8910_read_port_0_r)		// ???
 	AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -337,8 +337,8 @@ static ADDRESS_MAP_START( statriv2_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP)				// ???
 	AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_low_w)
 	AM_RANGE(0x2a, 0x2a) AM_WRITE(question_offset_high_w)
-	AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xb0, 0xb0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xb1, 0xb1) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -346,7 +346,7 @@ static ADDRESS_MAP_START( statriv4_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(input_port_0_r)
 	AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r)
 	AM_RANGE(0x28, 0x28) AM_READ(statriv2_questions_read)		// question data
-	AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r)		// ???
+	AM_RANGE(0xb1, 0xb1) AM_READ(ay8910_read_port_0_r)		// ???
 	AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -355,8 +355,8 @@ static ADDRESS_MAP_START( statriv4_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP)				// ???
 	AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_high_w)
 	AM_RANGE(0x2a, 0x2a) AM_WRITE(question_offset_low_w)
-	AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xb0, 0xb0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xb1, 0xb1) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -364,7 +364,7 @@ static ADDRESS_MAP_START( supertr2_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(input_port_0_r)
 	AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r)
 	AM_RANGE(0x28, 0x28) AM_READ(supertr2_questions_read)                // question data
-	AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r)		// ???
+	AM_RANGE(0xb1, 0xb1) AM_READ(ay8910_read_port_0_r)		// ???
 	AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP)			// ???
 ADDRESS_MAP_END
 
@@ -374,8 +374,8 @@ static ADDRESS_MAP_START( supertr2_writeport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x28, 0x28) AM_WRITE(question_offset_low_w)
 	AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_med_w)
 	AM_RANGE(0x2a, 0x2a) AM_WRITE(question_offset_high_w)
-	AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xb0, 0xb0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xb1, 0xb1) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -384,8 +384,8 @@ static ADDRESS_MAP_START( trivquiz_writeport, ADDRESS_SPACE_IO, 8 )
     AM_RANGE(0x23, 0x23) AM_WRITE(SMH_NOP)                               // ???
     AM_RANGE(0x28, 0x28) AM_WRITE(question_offset_low_w)
     AM_RANGE(0x29, 0x29) AM_WRITE(question_offset_high_w)
-	AM_RANGE(0xb0, 0xb0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xb1, 0xb1) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xb0, 0xb0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xb1, 0xb1) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0xc0, 0xcf) AM_WRITE(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -393,7 +393,7 @@ static ADDRESS_MAP_START( trivquiz_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(input_port_0_r)
 	AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r)
 	AM_RANGE(0x2a, 0x2a) AM_READ(statriv2_questions_read)                // question data
-	AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r)		// ???
+	AM_RANGE(0xb1, 0xb1) AM_READ(ay8910_read_port_0_r)		// ???
 	AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -401,7 +401,7 @@ static ADDRESS_MAP_START( supertr3_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(input_port_0_r)
 	AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r)
 	AM_RANGE(0x28, 0x28) AM_READ(supertr3_questions_read)                // question data
-	AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r)		// ???
+	AM_RANGE(0xb1, 0xb1) AM_READ(ay8910_read_port_0_r)		// ???
 	AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP)				// ???
 ADDRESS_MAP_END
 
@@ -409,7 +409,7 @@ static ADDRESS_MAP_START( hangman_readport, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x20, 0x20) AM_READ(input_port_0_r)
 	AM_RANGE(0x21, 0x21) AM_READ(input_port_1_r)
 	AM_RANGE(0x28, 0x28) AM_READ(hangman_questions_read)                // question data
-	AM_RANGE(0xb1, 0xb1) AM_READ(AY8910_read_port_0_r)		// ???
+	AM_RANGE(0xb1, 0xb1) AM_READ(ay8910_read_port_0_r)		// ???
 	AM_RANGE(0xce, 0xce) AM_READ(SMH_NOP)			// ???
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/stfight.c b/src/mame/drivers/stfight.c
index 80275e44d3a..c4a049a4040 100644
--- a/src/mame/drivers/stfight.c
+++ b/src/mame/drivers/stfight.c
@@ -267,8 +267,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2203_read_port_0_r)
-	AM_RANGE(0xc801, 0xc801) AM_READ(YM2203_read_port_1_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2203_read_port_0_r)
+	AM_RANGE(0xc801, 0xc801) AM_READ(ym2203_read_port_1_r)
 	AM_RANGE(0xf000, 0xf000) AM_READ(stfight_fm_r)
 	AM_RANGE(0xf800, 0xffff) AM_READ(SMH_RAM)
 
@@ -276,10 +276,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_cpu2, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0xc801, 0xc801) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0xc801, 0xc801) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xe800, 0xe800) AM_WRITE(stfight_e800_w)
 	AM_RANGE(0xf800, 0xffff) AM_WRITE(SMH_RAM)
 
diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c
index 446b78f54c4..a82056dd263 100644
--- a/src/mame/drivers/subsino.c
+++ b/src/mame/drivers/subsino.c
@@ -120,8 +120,8 @@ static ADDRESS_MAP_START( srider_map, ADDRESS_SPACE_PROGRAM, 8 )
 
 	AM_RANGE( 0x0d00c, 0x0d00c ) AM_READ_PORT( "INC" )
 
-	AM_RANGE( 0x0d016, 0x0d016 ) AM_WRITE( YM3812_control_port_0_w )
-	AM_RANGE( 0x0d017, 0x0d017 ) AM_WRITE( YM3812_write_port_0_w )
+	AM_RANGE( 0x0d016, 0x0d016 ) AM_WRITE( ym3812_control_port_0_w )
+	AM_RANGE( 0x0d017, 0x0d017 ) AM_WRITE( ym3812_write_port_0_w )
 
 	AM_RANGE( 0x0d018, 0x0d018 ) AM_WRITE( okim6295_data_0_w )
 
diff --git a/src/mame/drivers/suna16.c b/src/mame/drivers/suna16.c
index 62bd1e1d22e..cb648e0903a 100644
--- a/src/mame/drivers/suna16.c
+++ b/src/mame/drivers/suna16.c
@@ -252,15 +252,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( bssoccer_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM					)	// ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM					)	// RAM
-	AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r	)	// YM2151
+	AM_RANGE(0xf801, 0xf801) AM_READ(ym2151_status_port_0_r	)	// YM2151
 	AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r				)	// From Main CPU
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bssoccer_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM					)	// ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM					)	// RAM
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w	)	// YM2151
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w		)	//
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w	)	// YM2151
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ym2151_data_port_0_w		)	//
 	AM_RANGE(0xfd00, 0xfd00) AM_WRITE(soundlatch2_w 			)	// To PCM Z80 #1
 	AM_RANGE(0xfe00, 0xfe00) AM_WRITE(soundlatch3_w 			)	// To PCM Z80 #2
 ADDRESS_MAP_END
@@ -272,15 +272,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( uballoon_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM					)	// ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM					)	// RAM
-	AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r	)	// YM2151
+	AM_RANGE(0xf801, 0xf801) AM_READ(ym2151_status_port_0_r	)	// YM2151
 	AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r				)	// From Main CPU
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( uballoon_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM					)	// ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM					)	// RAM
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w	)	// YM2151
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w		)	//
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w	)	// YM2151
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ym2151_data_port_0_w		)	//
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w				)	// To PCM Z80
 ADDRESS_MAP_END
 
@@ -291,15 +291,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sunaq_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xe82f) AM_READ(SMH_ROM					)	// ROM
 	AM_RANGE(0xe830, 0xf7ff) AM_READ(SMH_RAM					)	// RAM
-	AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r	)	// YM2151
+	AM_RANGE(0xf801, 0xf801) AM_READ(ym2151_status_port_0_r	)	// YM2151
 	AM_RANGE(0xfc00, 0xfc00) AM_READ(soundlatch_r				)	// From Main CPU
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sunaq_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xe82f) AM_WRITE(SMH_ROM					)	// ROM
 	AM_RANGE(0xe830, 0xf7ff) AM_WRITE(SMH_RAM					)	// RAM (writes to efxx, could be a program bug tho)
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w	)	// YM2151
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w		)	//
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w	)	// YM2151
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ym2151_data_port_0_w		)	//
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(soundlatch2_w				)	// To PCM Z80
 ADDRESS_MAP_END
 
@@ -309,10 +309,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bestbest_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE( 0x0000, 0xbfff ) AM_ROM									// ROM
-	AM_RANGE( 0xc000, 0xc000 ) AM_WRITE( YM3526_control_port_0_w	)	// YM3526
-	AM_RANGE( 0xc001, 0xc001 ) AM_WRITE( YM3526_write_port_0_w		)	//
-	AM_RANGE( 0xc002, 0xc002 ) AM_WRITE( AY8910_control_port_0_w	)	// AY8910
-	AM_RANGE( 0xc003, 0xc003 ) AM_WRITE( AY8910_write_port_0_w		)	//
+	AM_RANGE( 0xc000, 0xc000 ) AM_WRITE( ym3526_control_port_0_w	)	// YM3526
+	AM_RANGE( 0xc001, 0xc001 ) AM_WRITE( ym3526_write_port_0_w		)	//
+	AM_RANGE( 0xc002, 0xc002 ) AM_WRITE( ay8910_control_port_0_w	)	// AY8910
+	AM_RANGE( 0xc003, 0xc003 ) AM_WRITE( ay8910_write_port_0_w		)	//
 	AM_RANGE( 0xe000, 0xe7ff ) AM_RAM									// RAM
 	AM_RANGE( 0xf000, 0xf000 ) AM_WRITE( soundlatch2_w				)	// To PCM Z80
 	AM_RANGE( 0xf800, 0xf800 ) AM_READ ( soundlatch_r				)	// From Main CPU
@@ -377,12 +377,12 @@ ADDRESS_MAP_END
 
 static WRITE8_HANDLER( bssoccer_DAC_1_w )
 {
-	DAC_data_w( 0 + (offset & 1), (data & 0xf) * 0x11 );
+	dac_data_w( 0 + (offset & 1), (data & 0xf) * 0x11 );
 }
 
 static WRITE8_HANDLER( bssoccer_DAC_2_w )
 {
-	DAC_data_w( 2 + (offset & 1), (data & 0xf) * 0x11 );
+	dac_data_w( 2 + (offset & 1), (data & 0xf) * 0x11 );
 }
 
 
diff --git a/src/mame/drivers/suna8.c b/src/mame/drivers/suna8.c
index 5dce0a019a8..e23503be206 100644
--- a/src/mame/drivers/suna8.c
+++ b/src/mame/drivers/suna8.c
@@ -1007,7 +1007,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( hardhead_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM					)	// ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_READ(SMH_RAM					)	// RAM
-	AM_RANGE(0xc800, 0xc800) AM_READ(YM3812_status_port_0_r 	)	// ? unsure
+	AM_RANGE(0xc800, 0xc800) AM_READ(ym3812_status_port_0_r 	)	// ? unsure
 	AM_RANGE(0xd800, 0xd800) AM_READ(soundlatch_r				)	// From Main CPU
 ADDRESS_MAP_END
 
@@ -1015,10 +1015,10 @@ static ADDRESS_MAP_START( hardhead_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM					)	// ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM					)	// RAM
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch2_w				)	//
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w	)	// YM3812
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w		)
-	AM_RANGE(0xa002, 0xa002) AM_WRITE(AY8910_control_port_0_w	)	// AY8910
-	AM_RANGE(0xa003, 0xa003) AM_WRITE(AY8910_write_port_0_w		)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym3812_control_port_0_w	)	// YM3812
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3812_write_port_0_w		)
+	AM_RANGE(0xa002, 0xa002) AM_WRITE(ay8910_control_port_0_w	)	// AY8910
+	AM_RANGE(0xa003, 0xa003) AM_WRITE(ay8910_write_port_0_w		)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hardhead_sound_readport, ADDRESS_SPACE_IO, 8 )
@@ -1046,10 +1046,10 @@ static ADDRESS_MAP_START( rranger_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM					)	// ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_WRITE(SMH_RAM					)	// RAM
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(soundlatch2_w				)	//
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w		)
-	AM_RANGE(0xa002, 0xa002) AM_WRITE(YM2203_control_port_1_w	)	// AY8910
-	AM_RANGE(0xa003, 0xa003) AM_WRITE(YM2203_write_port_1_w		)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w		)
+	AM_RANGE(0xa002, 0xa002) AM_WRITE(ym2203_control_port_1_w	)	// AY8910
+	AM_RANGE(0xa003, 0xa003) AM_WRITE(ym2203_write_port_1_w		)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( rranger_sound_readport, ADDRESS_SPACE_IO, 8 )
@@ -1073,10 +1073,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( brickzn_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM					)	// ROM
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM3812_control_port_0_w	)	// YM3812
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM3812_write_port_0_w		)
-	AM_RANGE(0xc002, 0xc002) AM_WRITE(AY8910_control_port_0_w	)	// AY8910
-	AM_RANGE(0xc003, 0xc003) AM_WRITE(AY8910_write_port_0_w		)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym3812_control_port_0_w	)	// YM3812
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym3812_write_port_0_w		)
+	AM_RANGE(0xc002, 0xc002) AM_WRITE(ay8910_control_port_0_w	)	// AY8910
+	AM_RANGE(0xc003, 0xc003) AM_WRITE(ay8910_write_port_0_w		)
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(SMH_RAM					)	// RAM
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w				)	// To PCM CPU
 ADDRESS_MAP_END
@@ -1102,7 +1102,7 @@ ADDRESS_MAP_END
 
 static WRITE8_HANDLER( brickzn_pcm_w )
 {
-	DAC_signed_data_w( offset, (data & 0xf) * 0x11 );
+	dac_signed_data_w( offset, (data & 0xf) * 0x11 );
 }
 
 static ADDRESS_MAP_START( brickzn_pcm_readport, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/supbtime.c b/src/mame/drivers/supbtime.c
index 7956c9cffca..17b201426f6 100644
--- a/src/mame/drivers/supbtime.c
+++ b/src/mame/drivers/supbtime.c
@@ -120,10 +120,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -132,7 +132,7 @@ static WRITE8_HANDLER( YM2151_w )
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_READ(SMH_ROM)
 	AM_RANGE(0x100000, 0x100001) AM_READ(SMH_NOP)
-	AM_RANGE(0x110000, 0x110001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x110000, 0x110001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x120000, 0x120001) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0x130000, 0x130001) AM_READ(SMH_NOP) /* This board only has 1 oki chip */
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/supdrapo.c b/src/mame/drivers/supdrapo.c
index 3b55d0fab8a..5c0caa1d23c 100644
--- a/src/mame/drivers/supdrapo.c
+++ b/src/mame/drivers/supdrapo.c
@@ -77,8 +77,8 @@ static ADDRESS_MAP_START( writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9000, 0x9097) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x9081, 0x9081) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x909d, 0x909d) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9800, 0x9800) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x9801, 0x9801) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x9800, 0x9800) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x9801, 0x9801) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( supdrapo )
diff --git a/src/mame/drivers/superqix.c b/src/mame/drivers/superqix.c
index 4e25a3581ab..99d4e7bd18c 100644
--- a/src/mame/drivers/superqix.c
+++ b/src/mame/drivers/superqix.c
@@ -535,9 +535,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( pbillian_port_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram)
-	AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x0401, 0x0401) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x0402, 0x0402) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0403, 0x0403) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x0408, 0x0408) AM_READ(pbillian_from_mcu_r)
 	AM_RANGE(0x0408, 0x0408) AM_WRITE(pbillian_z80_mcu_w)
 	AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w)
@@ -549,9 +549,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( hotsmash_port_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram)
-	AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x0401, 0x0401) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x0402, 0x0402) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0403, 0x0403) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x0408, 0x0408) AM_READ(hotsmash_from_mcu_r)
 	AM_RANGE(0x0408, 0x0408) AM_WRITE(hotsmash_z80_mcu_w)
 	AM_RANGE(0x0410, 0x0410) AM_WRITE(pbillian_0410_w)
@@ -563,12 +563,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sqix_port_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram)
-	AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x0405, 0x0405) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0x0406, 0x0406) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x0407, 0x0407) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x0401, 0x0401) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x0402, 0x0402) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0403, 0x0403) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x0405, 0x0405) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0x0406, 0x0406) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x0407, 0x0407) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x0408, 0x0408) AM_READ(mcu_acknowledge_r)
 	AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w)	/* ROM bank, NMI enable, tile bank */
 	AM_RANGE(0x0418, 0x0418) AM_READ(nmi_ack_r)
@@ -578,12 +578,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( bootleg_port_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x0000, 0x00ff) AM_RAM_WRITE(paletteram_BBGGRRII_w) AM_BASE(&paletteram)
-	AM_RANGE(0x0401, 0x0401) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x0402, 0x0402) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x0403, 0x0403) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x0405, 0x0405) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0x0406, 0x0406) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x0407, 0x0407) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x0401, 0x0401) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x0402, 0x0402) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x0403, 0x0403) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x0405, 0x0405) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0x0406, 0x0406) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x0407, 0x0407) AM_WRITE(ay8910_control_port_1_w)
 	AM_RANGE(0x0408, 0x0408) AM_WRITE(bootleg_flipscreen_w)
 	AM_RANGE(0x0410, 0x0410) AM_WRITE(superqix_0410_w)	/* ROM bank, NMI enable, tile bank */
 	AM_RANGE(0x0418, 0x0418) AM_READ_PORT("SYSTEM")
diff --git a/src/mame/drivers/supertnk.c b/src/mame/drivers/supertnk.c
index 7d54b0c63d9..a2439f38197 100644
--- a/src/mame/drivers/supertnk.c
+++ b/src/mame/drivers/supertnk.c
@@ -294,8 +294,8 @@ static ADDRESS_MAP_START( supertnk_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x1800, 0x1bff) AM_RAM
 	AM_RANGE(0x1efc, 0x1efc) AM_READ(input_port_0_r)
 	AM_RANGE(0x1efd, 0x1efd) AM_READ(input_port_1_r)
-	AM_RANGE(0x1efe, 0x1efe) AM_READWRITE(input_port_2_r, AY8910_control_port_0_w)
-	AM_RANGE(0x1eff, 0x1eff) AM_READWRITE(input_port_3_r, AY8910_write_port_0_w)
+	AM_RANGE(0x1efe, 0x1efe) AM_READWRITE(input_port_2_r, ay8910_control_port_0_w)
+	AM_RANGE(0x1eff, 0x1eff) AM_READWRITE(input_port_3_r, ay8910_write_port_0_w)
 	AM_RANGE(0x2000, 0x3fff) AM_READWRITE(supertnk_videoram_r, supertnk_videoram_w) AM_SIZE(&supertnk_videoram_size)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c
index 95e3eafad88..88be589eb72 100644
--- a/src/mame/drivers/suprgolf.c
+++ b/src/mame/drivers/suprgolf.c
@@ -104,8 +104,8 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x05, 0x05) AM_READ(input_port_4_r) AM_WRITE(rom_bank_select_w)
 	AM_RANGE(0x06, 0x06) AM_READ(suprgolf_random) // game locks up or crashes? if this doesn't return right values?
 
-	AM_RANGE(0x08, 0x08) AM_READ(YM2203_status_port_0_r) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x09, 0x09) AM_READ(YM2203_read_port_0_r) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x08, 0x08) AM_READ(ym2203_status_port_0_r) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x09, 0x09) AM_READ(ym2203_read_port_0_r) AM_WRITE(ym2203_write_port_0_w)
  ADDRESS_MAP_END
 
 static INPUT_PORTS_START( suprgolf )
diff --git a/src/mame/drivers/suprnova.c b/src/mame/drivers/suprnova.c
index 055e4a420ed..aa8534a7f4c 100644
--- a/src/mame/drivers/suprnova.c
+++ b/src/mame/drivers/suprnova.c
@@ -855,9 +855,9 @@ static WRITE32_HANDLER( skns_v3t_w )
 static WRITE32_HANDLER( skns_ymz280_w )
 {
 	if (ACCESSING_BITS_24_31)
-		YMZ280B_register_0_w(machine,offset,(data >> 24) & 0xff);
+		ymz280b_register_0_w(machine,offset,(data >> 24) & 0xff);
 	if (ACCESSING_BITS_16_23)
-		YMZ280B_data_0_w(machine,offset,(data >> 16) & 0xff);
+		ymz280b_data_0_w(machine,offset,(data >> 16) & 0xff);
 }
 
 static ADDRESS_MAP_START( skns_readmem, ADDRESS_SPACE_PROGRAM, 32 )
@@ -944,7 +944,7 @@ GFXDECODE_END
 
 /***** MACHINE DRIVER *****/
 
-static const struct YMZ280Binterface ymz280b_intf =
+static const ymz280b_interface ymz280b_intf =
 {
 	0	// irq ?
 };
diff --git a/src/mame/drivers/suprridr.c b/src/mame/drivers/suprridr.c
index fcf36566766..1ca4929e89b 100644
--- a/src/mame/drivers/suprridr.c
+++ b/src/mame/drivers/suprridr.c
@@ -204,10 +204,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(sound_irq_ack_w)
-	AM_RANGE(0x8c, 0x8c) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8d, 0x8d) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8f, 0x8f) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x8c, 0x8c) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8d, 0x8d) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x8e, 0x8e) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8f, 0x8f) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/suprslam.c b/src/mame/drivers/suprslam.c
index 2d42fe57b99..996635d1470 100644
--- a/src/mame/drivers/suprslam.c
+++ b/src/mame/drivers/suprslam.c
@@ -179,18 +179,18 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( suprslam_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x04, 0x04) AM_READ(soundlatch_r)
-	AM_RANGE(0x08, 0x08) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x0a, 0x0a) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x08, 0x08) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x0a, 0x0a) AM_READ(ym2610_status_port_0_b_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( suprslam_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(suprslam_sh_bankswitch_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(pending_command_clear_w)
-	AM_RANGE(0x08, 0x08) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2610_data_port_0_b_w)
 ADDRESS_MAP_END
 
 /*** INPUT PORTS *************************************************************/
diff --git a/src/mame/drivers/surpratk.c b/src/mame/drivers/surpratk.c
index 14a153bde2c..b51502da1fd 100644
--- a/src/mame/drivers/surpratk.c
+++ b/src/mame/drivers/surpratk.c
@@ -94,7 +94,7 @@ static ADDRESS_MAP_START( surpratk_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x5f8e, 0x5f8e) AM_READ(input_port_4_r)
 	AM_RANGE(0x5f8f, 0x5f8f) AM_READ(input_port_2_r)
 	AM_RANGE(0x5f90, 0x5f90) AM_READ(input_port_3_r)
-//  AM_RANGE(0x5f91, 0x5f91) AM_READ(YM2151_status_port_0_r)    /* ? */
+//  AM_RANGE(0x5f91, 0x5f91) AM_READ(ym2151_status_port_0_r)    /* ? */
 	AM_RANGE(0x5fa0, 0x5faf) AM_READ(K053244_r)
 	AM_RANGE(0x5fc0, 0x5fc0) AM_READ(watchdog_reset_r)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(K052109_r)
@@ -108,8 +108,8 @@ static ADDRESS_MAP_START( surpratk_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x5fa0, 0x5faf) AM_WRITE(K053244_w)
 	AM_RANGE(0x5fb0, 0x5fbf) AM_WRITE(K053251_w)
 	AM_RANGE(0x5fc0, 0x5fc0) AM_WRITE(surpratk_5fc0_w)
-	AM_RANGE(0x5fd0, 0x5fd0) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x5fd1, 0x5fd1) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x5fd0, 0x5fd0) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x5fd1, 0x5fd1) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x5fc4, 0x5fc4) AM_WRITE(surpratk_videobank_w)
 	AM_RANGE(0x4000, 0x7fff) AM_WRITE(K052109_w)
 	AM_RANGE(0x8000, 0xffff) AM_WRITE(SMH_ROM)					/* ROM */
diff --git a/src/mame/drivers/system16.c b/src/mame/drivers/system16.c
index 9aae416e7e3..b2f9e5302be 100644
--- a/src/mame/drivers/system16.c
+++ b/src/mame/drivers/system16.c
@@ -336,14 +336,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tturfbl_sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x80, 0x80) AM_READ(SMH_NOP)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tturfbl_sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x80, 0x80) AM_WRITE(SMH_NOP)
 ADDRESS_MAP_END
@@ -363,14 +363,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x01, 0x01) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x01, 0x01) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2151_data_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -395,8 +395,8 @@ static WRITE8_HANDLER( upd7759_bank_w ) //*
 
 static ADDRESS_MAP_START( sound_writeport_7759, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x40, 0x40) AM_WRITE(upd7759_bank_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(upd7759_0_port_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/system18.c b/src/mame/drivers/system18.c
index 648d8e3adab..c8a84ad7a9a 100644
--- a/src/mame/drivers/system18.c
+++ b/src/mame/drivers/system18.c
@@ -227,14 +227,14 @@ static ADDRESS_MAP_START( shdancbl_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0xbfff) AM_READ(shdancbl_soundbank_r)
 	AM_RANGE(0xc400, 0xc400) AM_READ(soundlatch_r)
-	AM_RANGE(0xcc00, 0xcc00) AM_READ(YM3438_status_port_0_A_r)
-	AM_RANGE(0xcc01, 0xcc01) AM_READ(YM3438_status_port_0_B_r)
-	AM_RANGE(0xcc02, 0xcc02) AM_READ(YM3438_status_port_0_B_r)
-	AM_RANGE(0xcc03, 0xcc03) AM_READ(YM3438_status_port_0_B_r)
-	AM_RANGE(0xd000, 0xd000) AM_READ(YM3438_status_port_1_A_r)
-	AM_RANGE(0xd001, 0xd001) AM_READ(YM3438_status_port_1_B_r)
-	AM_RANGE(0xd002, 0xd002) AM_READ(YM3438_status_port_1_B_r)
-	AM_RANGE(0xd003, 0xd003) AM_READ(YM3438_status_port_1_B_r)
+	AM_RANGE(0xcc00, 0xcc00) AM_READ(ym3438_status_port_0_a_r)
+	AM_RANGE(0xcc01, 0xcc01) AM_READ(ym3438_status_port_0_b_r)
+	AM_RANGE(0xcc02, 0xcc02) AM_READ(ym3438_status_port_0_b_r)
+	AM_RANGE(0xcc03, 0xcc03) AM_READ(ym3438_status_port_0_b_r)
+	AM_RANGE(0xd000, 0xd000) AM_READ(ym3438_status_port_1_a_r)
+	AM_RANGE(0xd001, 0xd001) AM_READ(ym3438_status_port_1_b_r)
+	AM_RANGE(0xd002, 0xd002) AM_READ(ym3438_status_port_1_b_r)
+	AM_RANGE(0xd003, 0xd003) AM_READ(ym3438_status_port_1_b_r)
 	AM_RANGE(0xdf00, 0xdfff) AM_READ(SMH_NOP)
 	AM_RANGE(0xe000, 0xffff) AM_READ(SMH_RAM)
 ADDRESS_MAP_END
@@ -244,14 +244,14 @@ static ADDRESS_MAP_START(shdancbl_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_NOP) /* ROM bank */
 	AM_RANGE(0xc000, 0xc00f) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xc800, 0xc800) AM_WRITE(shdancbl_msm5205_data_w)
-	AM_RANGE(0xcc00, 0xcc00) AM_WRITE(YM3438_control_port_0_A_w)
-	AM_RANGE(0xcc01, 0xcc01) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0xcc02, 0xcc02) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0xcc03, 0xcc03) AM_WRITE(YM3438_data_port_0_B_w)
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(YM3438_control_port_1_A_w)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(YM3438_data_port_1_A_w)
-	AM_RANGE(0xd002, 0xd002) AM_WRITE(YM3438_control_port_1_B_w)
-	AM_RANGE(0xd003, 0xd003) AM_WRITE(YM3438_data_port_1_B_w)
+	AM_RANGE(0xcc00, 0xcc00) AM_WRITE(ym3438_control_port_0_a_w)
+	AM_RANGE(0xcc01, 0xcc01) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0xcc02, 0xcc02) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0xcc03, 0xcc03) AM_WRITE(ym3438_data_port_0_b_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ym3438_control_port_1_a_w)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ym3438_data_port_1_a_w)
+	AM_RANGE(0xd002, 0xd002) AM_WRITE(ym3438_control_port_1_b_w)
+	AM_RANGE(0xd003, 0xd003) AM_WRITE(ym3438_data_port_1_b_w)
 	AM_RANGE(0xd400, 0xd400) AM_WRITE(shdancbl_bankctrl_w)
 	AM_RANGE(0xdf00, 0xdfff) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xe000, 0xffff) AM_WRITE(SMH_RAM)
@@ -309,23 +309,23 @@ static WRITE8_HANDLER( sys18_soundbank_w )
 
 static ADDRESS_MAP_START( sound_readport_18, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_READ(YM3438_status_port_0_A_r)
-//  AM_RANGE(0x82, 0x82) AM_READ(YM3438_status_port_0_B_r)
-//  AM_RANGE(0x90, 0x90) AM_READ(YM3438_status_port_1_A_r)
-//  AM_RANGE(0x92, 0x92) AM_READ(YM3438_status_port_1_B_r)
+	AM_RANGE(0x80, 0x80) AM_READ(ym3438_status_port_0_a_r)
+//  AM_RANGE(0x82, 0x82) AM_READ(ym3438_status_port_0_b_r)
+//  AM_RANGE(0x90, 0x90) AM_READ(ym3438_status_port_1_a_r)
+//  AM_RANGE(0x92, 0x92) AM_READ(ym3438_status_port_1_b_r)
 	AM_RANGE(0xc0, 0xc0) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport_18, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM3438_control_port_0_A_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(YM3438_data_port_0_A_w)
-	AM_RANGE(0x82, 0x82) AM_WRITE(YM3438_control_port_0_B_w)
-	AM_RANGE(0x83, 0x83) AM_WRITE(YM3438_data_port_0_B_w)
-	AM_RANGE(0x90, 0x90) AM_WRITE(YM3438_control_port_1_A_w)
-	AM_RANGE(0x91, 0x91) AM_WRITE(YM3438_data_port_1_A_w)
-	AM_RANGE(0x92, 0x92) AM_WRITE(YM3438_control_port_1_B_w)
-	AM_RANGE(0x93, 0x93) AM_WRITE(YM3438_data_port_1_B_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym3438_control_port_0_a_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ym3438_data_port_0_a_w)
+	AM_RANGE(0x82, 0x82) AM_WRITE(ym3438_control_port_0_b_w)
+	AM_RANGE(0x83, 0x83) AM_WRITE(ym3438_data_port_0_b_w)
+	AM_RANGE(0x90, 0x90) AM_WRITE(ym3438_control_port_1_a_w)
+	AM_RANGE(0x91, 0x91) AM_WRITE(ym3438_data_port_1_a_w)
+	AM_RANGE(0x92, 0x92) AM_WRITE(ym3438_control_port_1_b_w)
+	AM_RANGE(0x93, 0x93) AM_WRITE(ym3438_data_port_1_b_w)
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(sys18_soundbank_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/tagteam.c b/src/mame/drivers/tagteam.c
index e9f738cc995..d31fb4d08b8 100644
--- a/src/mame/drivers/tagteam.c
+++ b/src/mame/drivers/tagteam.c
@@ -68,11 +68,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x03ff) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2002, 0x2002) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x2003, 0x2003) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x2004, 0x2004) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2002, 0x2002) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x2003, 0x2003) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x2004, 0x2004) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x2005, 0x2005) AM_WRITE(interrupt_enable_w)
 	AM_RANGE(0x2007, 0x2007) AM_READ(soundlatch_r)
 	AM_RANGE(0x4000, 0xffff) AM_READ(SMH_ROM)
diff --git a/src/mame/drivers/tail2nos.c b/src/mame/drivers/tail2nos.c
index 838f1d7f22d..846a4125f6c 100644
--- a/src/mame/drivers/tail2nos.c
+++ b/src/mame/drivers/tail2nos.c
@@ -93,13 +93,13 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x07, 0x07) AM_READWRITE(soundlatch_r, SMH_NOP)	/* the write is a clear pending command */
-	AM_RANGE(0x08, 0x08) AM_WRITE(YM2608_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2608_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_WRITE(YM2608_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2608_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_WRITE(ym2608_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2608_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_WRITE(ym2608_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2608_data_port_0_b_w)
 #if 0
-	AM_RANGE(0x18, 0x18) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0x1a, 0x1a) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0x18, 0x18) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0x1a, 0x1a) AM_READ(ym2610_status_port_0_b_r)
 #endif
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/taito_b.c b/src/mame/drivers/taito_b.c
index b970ad5d3ee..540bb738553 100644
--- a/src/mame/drivers/taito_b.c
+++ b/src/mame/drivers/taito_b.c
@@ -994,15 +994,15 @@ static ADDRESS_MAP_START( masterw_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( masterw_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 ADDRESS_MAP_END
@@ -1011,9 +1011,9 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -1022,10 +1022,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
@@ -1039,7 +1039,7 @@ static ADDRESS_MAP_START( viofight_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xb000, 0xb000) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -1047,8 +1047,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( viofight_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xb000, 0xb001) AM_WRITE(okim6295_data_0_w)		/* yes, both addresses for the same chip */
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
diff --git a/src/mame/drivers/taito_f2.c b/src/mame/drivers/taito_f2.c
index 6c03c98d361..6875ffddd6d 100644
--- a/src/mame/drivers/taito_f2.c
+++ b/src/mame/drivers/taito_f2.c
@@ -1676,9 +1676,9 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -1687,10 +1687,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
@@ -1706,7 +1706,7 @@ static ADDRESS_MAP_START( camltrya_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)	// I can't see a bank control, but there ARE some bytes past 0x8000
 //  AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xb000, 0xb000) AM_READ(okim6295_status_0_r)
 ADDRESS_MAP_END
@@ -1714,8 +1714,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( camltrya_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 //  AM_RANGE(0xb000, 0xb000) AM_WRITE(unknown_w)    // probably controlling sample player?
diff --git a/src/mame/drivers/taito_h.c b/src/mame/drivers/taito_h.c
index 781d2d33923..c22b05a9602 100644
--- a/src/mame/drivers/taito_h.c
+++ b/src/mame/drivers/taito_h.c
@@ -329,9 +329,9 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK1)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -340,10 +340,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP)		/* pan control */
diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c
index 9b814a77bce..a3055d8f0ab 100644
--- a/src/mame/drivers/taito_l.c
+++ b/src/mame/drivers/taito_l.c
@@ -466,13 +466,13 @@ static READ8_HANDLER( portB_r )
 static READ8_HANDLER( ym2203_data0_r )
 {
 	extport = 0;
-	return YM2203_read_port_0_r(machine,offset);
+	return ym2203_read_port_0_r(machine,offset);
 }
 
 static READ8_HANDLER( ym2203_data1_r )
 {
 	extport = 1;
-	return YM2203_read_port_0_r(machine,offset);
+	return ym2203_read_port_0_r(machine,offset);
 }
 
 static const UINT8 *mcu_reply;
@@ -688,14 +688,14 @@ static READ8_HANDLER( horshoes_trackx_hi_r )
 	AM_RANGE(0xff08, 0xff08) AM_WRITE(rombankswitch_w)
 
 #define COMMON_SINGLE_READ \
-	AM_RANGE(0xa000, 0xa000) AM_READ(YM2203_status_port_0_r)	\
+	AM_RANGE(0xa000, 0xa000) AM_READ(ym2203_status_port_0_r)	\
 	AM_RANGE(0xa001, 0xa001) AM_READ(ym2203_data0_r)			\
 	AM_RANGE(0xa003, 0xa003) AM_READ(ym2203_data1_r)			\
 	AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM)
 
 #define COMMON_SINGLE_WRITE \
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2203_control_port_0_w)	\
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_0_w)		\
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2203_control_port_0_w)	\
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_0_w)		\
 	AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM)
 
 
@@ -742,7 +742,7 @@ static ADDRESS_MAP_START( fhawk_3_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_RAM)
 	AM_RANGE(0xe000, 0xe000) AM_READ(SMH_NOP)
 	AM_RANGE(0xe001, 0xe001) AM_READ(taitosound_slave_comm_r)
-	AM_RANGE(0xf000, 0xf000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0xf000, 0xf000) AM_READ(ym2203_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( fhawk_3_writemem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -750,8 +750,8 @@ static ADDRESS_MAP_START( fhawk_3_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x9fff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe001, 0xe001) AM_WRITE(taitosound_slave_comm_w)
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( raimais_readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -790,9 +790,9 @@ static ADDRESS_MAP_START( raimais_3_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK7)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -808,10 +808,10 @@ static WRITE8_HANDLER( sound_bankswitch_w )
 static ADDRESS_MAP_START( raimais_3_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
@@ -864,7 +864,7 @@ static ADDRESS_MAP_START( champwr_3_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK7)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x9000, 0x9000) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xa000, 0xa000) AM_READ(SMH_NOP)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
@@ -872,8 +872,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( champwr_3_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(champwr_msm5205_hi_w)
@@ -904,7 +904,7 @@ static ADDRESS_MAP_START( kurikint_2_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
 	AM_RANGE(0xe000, 0xe7ff) AM_READ(shared_r)
-	AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0xe800, 0xe800) AM_READ(ym2203_status_port_0_r)
 #if 0
 	AM_RANGE(0xd000, 0xd000) AM_READ_PORT("DSWA")
 	AM_RANGE(0xd001, 0xd001) AM_READ_PORT("DSWB")
@@ -918,8 +918,8 @@ static ADDRESS_MAP_START( kurikint_2_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(shared_w)
-	AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe801, 0xe801) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe801, 0xe801) AM_WRITE(ym2203_write_port_0_w)
 #if 0
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(rombank2switch_w)
 #endif
@@ -1068,7 +1068,7 @@ static ADDRESS_MAP_START( evilston_2_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_READ(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
 	AM_RANGE(0xe000, 0xe7ff) AM_READ(shared_r)//shared_r },
-	AM_RANGE(0xe800, 0xe800) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0xe800, 0xe800) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_BANK7)
 ADDRESS_MAP_END
 
@@ -1076,8 +1076,8 @@ static ADDRESS_MAP_START( evilston_2_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe000, 0xe7ff) AM_WRITE(shared_w)
-	AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xe801, 0xe801) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xe801, 0xe801) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c
index 18513ed0f5b..7ad6fda1d40 100644
--- a/src/mame/drivers/taito_x.c
+++ b/src/mame/drivers/taito_x.c
@@ -520,9 +520,9 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -531,10 +531,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
@@ -547,7 +547,7 @@ static ADDRESS_MAP_START( daisenpu_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xe000, 0xe001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -556,8 +556,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( daisenpu_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
@@ -570,10 +570,10 @@ static ADDRESS_MAP_START( ballbros_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK2)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
-	AM_RANGE(0xe003, 0xe003) AM_READ(YM2610_read_port_0_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
+	AM_RANGE(0xe003, 0xe003) AM_READ(ym2610_read_port_0_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
@@ -583,10 +583,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ballbros_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c
index 3e4f3d49e4d..3b7625fca50 100644
--- a/src/mame/drivers/taito_z.c
+++ b/src/mame/drivers/taito_z.c
@@ -1687,9 +1687,9 @@ static ADDRESS_MAP_START( bshark_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x108000, 0x10bfff) AM_READ(SMH_RAM)
 	AM_RANGE(0x110000, 0x113fff) AM_READ(sharedram_r)
 //  AM_RANGE(0x40000a, 0x40000b) AM_READ(taitoz_unknown_r)  // ???
-	AM_RANGE(0x600000, 0x600001) AM_READ(YM2610_status_port_0_A_lsb_r)
-	AM_RANGE(0x600002, 0x600003) AM_READ(YM2610_read_port_0_lsb_r)
-	AM_RANGE(0x600004, 0x600005) AM_READ(YM2610_status_port_0_B_lsb_r)
+	AM_RANGE(0x600000, 0x600001) AM_READ(ym2610_status_port_0_a_lsb_r)
+	AM_RANGE(0x600002, 0x600003) AM_READ(ym2610_read_port_0_lsb_r)
+	AM_RANGE(0x600004, 0x600005) AM_READ(ym2610_status_port_0_b_lsb_r)
 	AM_RANGE(0x60000c, 0x60000d) AM_READ(SMH_NOP)
 	AM_RANGE(0x60000e, 0x60000f) AM_READ(SMH_NOP)
 	AM_RANGE(0x800000, 0x801fff) AM_READ(TC0150ROD_word_r)	/* "root ram" */
@@ -1700,10 +1700,10 @@ static ADDRESS_MAP_START( bshark_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x108000, 0x10bfff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x110000, 0x113fff) AM_WRITE(sharedram_w)
 	AM_RANGE(0x400000, 0x400007) AM_WRITE(spacegun_pancontrol)  /* pan */
-	AM_RANGE(0x600000, 0x600001) AM_WRITE(YM2610_control_port_0_A_lsb_w)
-	AM_RANGE(0x600002, 0x600003) AM_WRITE(YM2610_data_port_0_A_lsb_w)
-	AM_RANGE(0x600004, 0x600005) AM_WRITE(YM2610_control_port_0_B_lsb_w)
-	AM_RANGE(0x600006, 0x600007) AM_WRITE(YM2610_data_port_0_B_lsb_w)
+	AM_RANGE(0x600000, 0x600001) AM_WRITE(ym2610_control_port_0_a_lsb_w)
+	AM_RANGE(0x600002, 0x600003) AM_WRITE(ym2610_data_port_0_a_lsb_w)
+	AM_RANGE(0x600004, 0x600005) AM_WRITE(ym2610_control_port_0_b_lsb_w)
+	AM_RANGE(0x600006, 0x600007) AM_WRITE(ym2610_data_port_0_b_lsb_w)
 	AM_RANGE(0x60000c, 0x60000d) AM_WRITE(SMH_NOP)	// interrupt controller?
 	AM_RANGE(0x60000e, 0x60000f) AM_WRITE(SMH_NOP)
 	AM_RANGE(0x800000, 0x801fff) AM_WRITE(TC0150ROD_word_w)	/* "root ram" */
@@ -1869,9 +1869,9 @@ static ADDRESS_MAP_START( spacegun_cpub_readmem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x20c000, 0x20ffff) AM_READ(SMH_RAM)	/* local CPUB ram */
 	AM_RANGE(0x210000, 0x21ffff) AM_READ(sharedram_r)
 	AM_RANGE(0x800000, 0x80000f) AM_READ(spacegun_input_bypass_r)
-	AM_RANGE(0xc00000, 0xc00001) AM_READ(YM2610_status_port_0_A_lsb_r)
-	AM_RANGE(0xc00002, 0xc00003) AM_READ(YM2610_read_port_0_lsb_r)
-	AM_RANGE(0xc00004, 0xc00005) AM_READ(YM2610_status_port_0_B_lsb_r)
+	AM_RANGE(0xc00000, 0xc00001) AM_READ(ym2610_status_port_0_a_lsb_r)
+	AM_RANGE(0xc00002, 0xc00003) AM_READ(ym2610_read_port_0_lsb_r)
+	AM_RANGE(0xc00004, 0xc00005) AM_READ(ym2610_status_port_0_b_lsb_r)
 	AM_RANGE(0xc0000c, 0xc0000d) AM_READ(SMH_NOP)
 	AM_RANGE(0xc0000e, 0xc0000f) AM_READ(SMH_NOP)
 	AM_RANGE(0xf00000, 0xf00007) AM_READ(spacegun_lightgun_r)
@@ -1882,10 +1882,10 @@ static ADDRESS_MAP_START( spacegun_cpub_writemem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x20c000, 0x20ffff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x210000, 0x21ffff) AM_WRITE(sharedram_w)
 	AM_RANGE(0x800000, 0x80000f) AM_WRITE(spacegun_output_bypass_w)
-	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(YM2610_control_port_0_A_lsb_w)
-	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(YM2610_data_port_0_A_lsb_w)
-	AM_RANGE(0xc00004, 0xc00005) AM_WRITE(YM2610_control_port_0_B_lsb_w)
-	AM_RANGE(0xc00006, 0xc00007) AM_WRITE(YM2610_data_port_0_B_lsb_w)
+	AM_RANGE(0xc00000, 0xc00001) AM_WRITE(ym2610_control_port_0_a_lsb_w)
+	AM_RANGE(0xc00002, 0xc00003) AM_WRITE(ym2610_data_port_0_a_lsb_w)
+	AM_RANGE(0xc00004, 0xc00005) AM_WRITE(ym2610_control_port_0_b_lsb_w)
+	AM_RANGE(0xc00006, 0xc00007) AM_WRITE(ym2610_data_port_0_b_lsb_w)
 	AM_RANGE(0xc0000c, 0xc0000d) AM_WRITE(SMH_NOP)	// interrupt controller?
 	AM_RANGE(0xc0000e, 0xc0000f) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xc20000, 0xc20007) AM_WRITE(spacegun_pancontrol)  /* pan */
@@ -1991,9 +1991,9 @@ static ADDRESS_MAP_START( z80_sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)
 	AM_RANGE(0xc000, 0xdfff) AM_READ(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_READ(YM2610_status_port_0_A_r)
-	AM_RANGE(0xe001, 0xe001) AM_READ(YM2610_read_port_0_r)
-	AM_RANGE(0xe002, 0xe002) AM_READ(YM2610_status_port_0_B_r)
+	AM_RANGE(0xe000, 0xe000) AM_READ(ym2610_status_port_0_a_r)
+	AM_RANGE(0xe001, 0xe001) AM_READ(ym2610_read_port_0_r)
+	AM_RANGE(0xe002, 0xe002) AM_READ(ym2610_status_port_0_b_r)
 	AM_RANGE(0xe200, 0xe200) AM_READ(SMH_NOP)
 	AM_RANGE(0xe201, 0xe201) AM_READ(taitosound_slave_comm_r)
 	AM_RANGE(0xea00, 0xea00) AM_READ(SMH_NOP)
@@ -2002,10 +2002,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( z80_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_WRITE(YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_WRITE(ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(taitoz_pancontrol) /* pan */
diff --git a/src/mame/drivers/taitoair.c b/src/mame/drivers/taitoair.c
index 2dc38e5edc1..803c9ff7ecd 100644
--- a/src/mame/drivers/taitoair.c
+++ b/src/mame/drivers/taitoair.c
@@ -396,10 +396,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2610_read_port_0_r, ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP)		/* pan control */
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 422bb8fee2c..31f4a0ccd08 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -220,8 +220,8 @@ static ADDRESS_MAP_START( taitosj_main_nomcu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2")
 	AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3")			/* Service */
 	AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4")
-	AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)	/* DSW2 and DSW3 */
+	AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)	/* DSW2 and DSW3 */
 	AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll)
 	AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_colorbank)
 	AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE(taitosj_collision_reg_clear_w)
@@ -260,8 +260,8 @@ static ADDRESS_MAP_START( taitosj_main_mcu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2")
 	AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3")			/* Service */
 	AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4")
-	AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)	/* DSW2 and DSW3 */
+	AM_RANGE(0xd40e, 0xd40e) AM_MIRROR(0x00f0) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd40f, 0xd40f) AM_MIRROR(0x00f0) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)	/* DSW2 and DSW3 */
 	AM_RANGE(0xd500, 0xd505) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_scroll)
 	AM_RANGE(0xd506, 0xd507) AM_MIRROR(0x00f0) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_colorbank)
 	AM_RANGE(0xd508, 0xd508) AM_MIRROR(0x00f0) AM_WRITE(taitosj_collision_reg_clear_w)
@@ -326,8 +326,8 @@ static ADDRESS_MAP_START( kikstart_main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xd40b, 0xd40b) AM_MIRROR(0x00f0) AM_READ_PORT("IN2")
 	AM_RANGE(0xd40c, 0xd40c) AM_MIRROR(0x00f0) AM_READ_PORT("IN3")			/* Service */
 	AM_RANGE(0xd40d, 0xd40d) AM_MIRROR(0x00f0) AM_READ_PORT("IN4")
-	AM_RANGE(0xd40e, 0xd40e) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xd40f, 0xd40f) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)	/* DSW2 and DSW3 */
+	AM_RANGE(0xd40e, 0xd40e) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xd40f, 0xd40f) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)	/* DSW2 and DSW3 */
 	AM_RANGE(0xd508, 0xd508) AM_WRITE(taitosj_collision_reg_clear_w)
 	AM_RANGE(0xd509, 0xd50a) AM_WRITE(SMH_RAM) AM_BASE(&taitosj_gfxpointer)
 	AM_RANGE(0xd50b, 0xd50b) AM_WRITE(taitosj_soundcommand_w)
@@ -342,12 +342,12 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( taitosj_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x43ff) AM_RAM
-	AM_RANGE(0x4800, 0x4800) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x4801, 0x4801) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x4802, 0x4802) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x4803, 0x4803) AM_READWRITE(AY8910_read_port_2_r, AY8910_write_port_2_w)
-	AM_RANGE(0x4804, 0x4804) AM_WRITE(AY8910_control_port_3_w)
-	AM_RANGE(0x4805, 0x4805) AM_READWRITE(AY8910_read_port_3_r, AY8910_write_port_3_w)
+	AM_RANGE(0x4800, 0x4800) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x4801, 0x4801) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x4802, 0x4802) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x4803, 0x4803) AM_READWRITE(ay8910_read_port_2_r, ay8910_write_port_2_w)
+	AM_RANGE(0x4804, 0x4804) AM_WRITE(ay8910_control_port_3_w)
+	AM_RANGE(0x4805, 0x4805) AM_READWRITE(ay8910_read_port_3_r, ay8910_write_port_3_w)
 	AM_RANGE(0x5000, 0x5000) AM_READ(soundlatch_r)
 	AM_RANGE(0xe000, 0xefff) AM_ROM	/* space for diagnostic ROM */
 ADDRESS_MAP_END
@@ -1765,13 +1765,13 @@ static UINT8 dac_vol;
 static WRITE8_HANDLER( dac_out_w )
 {
 	dac_out = data - 0x80;
-	DAC_signed_data_16_w(0,dac_out * dac_vol + 0x8000);
+	dac_signed_data_16_w(0,dac_out * dac_vol + 0x8000);
 }
 
 static WRITE8_HANDLER( dac_vol_w )
 {
 	dac_vol = voltable[data];
-	DAC_signed_data_16_w(0,dac_out * dac_vol + 0x8000);
+	dac_signed_data_16_w(0,dac_out * dac_vol + 0x8000);
 }
 
 
diff --git a/src/mame/drivers/tankbust.c b/src/mame/drivers/tankbust.c
index b73e50069d1..e5d996d911a 100644
--- a/src/mame/drivers/tankbust.c
+++ b/src/mame/drivers/tankbust.c
@@ -212,12 +212,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( port_map_cpu2, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x30, 0x30) AM_READ(AY8910_read_port_1_r)
-	AM_RANGE(0x30, 0x30) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xc0, 0xc0) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0xc0, 0xc0) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x10, 0x10) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x30, 0x30) AM_READ(ay8910_read_port_1_r)
+	AM_RANGE(0x30, 0x30) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xc0, 0xc0) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0xc0, 0xc0) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/taotaido.c b/src/mame/drivers/taotaido.c
index 3c7ab95deac..0413d3d9269 100644
--- a/src/mame/drivers/taotaido.c
+++ b/src/mame/drivers/taotaido.c
@@ -148,10 +148,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(taotaido_sh_bankswitch_w)
 	AM_RANGE(0x08, 0x08) AM_WRITE(pending_command_clear_w)
 	AM_RANGE(0x0c, 0x0c) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/tatsumi.c b/src/mame/drivers/tatsumi.c
index a5c502a6c01..6dd75d69003 100644
--- a/src/mame/drivers/tatsumi.c
+++ b/src/mame/drivers/tatsumi.c
@@ -214,8 +214,8 @@ static ADDRESS_MAP_START( apache3_v20_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x00000, 0x01fff) AM_RAM
 	AM_RANGE(0x04000, 0x04003) AM_NOP // piu select .. ?
 	AM_RANGE(0x06000, 0x06001) AM_READ_PORT("IN0") // esw
-	AM_RANGE(0x08000, 0x08000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x08001, 0x08001) AM_READWRITE(tatsumi_hack_ym2151_r, YM2151_data_port_0_w)
+	AM_RANGE(0x08000, 0x08000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x08001, 0x08001) AM_READWRITE(tatsumi_hack_ym2151_r, ym2151_data_port_0_w)
 	AM_RANGE(0x0a000, 0x0a000) AM_READWRITE(tatsumi_hack_oki_r, okim6295_data_0_w)
 	AM_RANGE(0x0e000, 0x0e007) AM_READWRITE(apache3_adc_r, apache3_adc_w) //adc select
 	AM_RANGE(0xf0000, 0xfffff) AM_ROM
@@ -259,8 +259,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( roundup5_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xdfff) AM_ROM
 	AM_RANGE(0xe000, 0xffef) AM_RAM
-	AM_RANGE(0xfff0, 0xfff0) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xfff1, 0xfff1) AM_READWRITE(tatsumi_hack_ym2151_r, YM2151_data_port_0_w)
+	AM_RANGE(0xfff0, 0xfff0) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xfff1, 0xfff1) AM_READWRITE(tatsumi_hack_ym2151_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfff4, 0xfff4) AM_READWRITE(tatsumi_hack_oki_r, okim6295_data_0_w)
 	AM_RANGE(0xfff8, 0xfff8) AM_READ_PORT("IN0")
 	AM_RANGE(0xfff9, 0xfff9) AM_READ_PORT("IN1")
@@ -317,8 +317,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( cyclwarr_z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xdfff) AM_ROM
 	AM_RANGE(0xe000, 0xffef) AM_RAM
-	AM_RANGE(0xfff0, 0xfff0) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xfff1, 0xfff1) AM_READWRITE(tatsumi_hack_ym2151_r, YM2151_data_port_0_w)
+	AM_RANGE(0xfff0, 0xfff0) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xfff1, 0xfff1) AM_READWRITE(tatsumi_hack_ym2151_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfff4, 0xfff4) AM_READWRITE(tatsumi_hack_oki_r, okim6295_data_0_w)
 	AM_RANGE(0xfffc, 0xfffc) AM_READ(soundlatch_r)
 	AM_RANGE(0xfffe, 0xfffe) AM_WRITE(SMH_NOP)
diff --git a/src/mame/drivers/taxidrvr.c b/src/mame/drivers/taxidrvr.c
index fbcb6f79670..c6c433bf256 100644
--- a/src/mame/drivers/taxidrvr.c
+++ b/src/mame/drivers/taxidrvr.c
@@ -182,10 +182,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cpu3_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/tbowl.c b/src/mame/drivers/tbowl.c
index 74b34b3e951..8cbec410e67 100644
--- a/src/mame/drivers/tbowl.c
+++ b/src/mame/drivers/tbowl.c
@@ -201,10 +201,10 @@ static void tbowl_adpcm_int(running_machine *machine, int num)
 static ADDRESS_MAP_START( 6206A_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xd000, 0xd000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xd001, 0xd001) AM_WRITE(YM3812_write_port_0_w)
-	AM_RANGE(0xd800, 0xd800) AM_WRITE(YM3812_control_port_1_w)
-	AM_RANGE(0xd801, 0xd801) AM_WRITE(YM3812_write_port_1_w)
+	AM_RANGE(0xd000, 0xd000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xd001, 0xd001) AM_WRITE(ym3812_write_port_0_w)
+	AM_RANGE(0xd800, 0xd800) AM_WRITE(ym3812_control_port_1_w)
+	AM_RANGE(0xd801, 0xd801) AM_WRITE(ym3812_write_port_1_w)
 	AM_RANGE(0xe000, 0xe001) AM_WRITE(tbowl_adpcm_end_w)
 	AM_RANGE(0xe002, 0xe003) AM_WRITE(tbowl_adpcm_start_w)
 	AM_RANGE(0xe004, 0xe005) AM_WRITE(tbowl_adpcm_vol_w)
diff --git a/src/mame/drivers/tceptor.c b/src/mame/drivers/tceptor.c
index c143bbfa36a..a24872e33a3 100644
--- a/src/mame/drivers/tceptor.c
+++ b/src/mame/drivers/tceptor.c
@@ -111,7 +111,7 @@ static WRITE8_HANDLER( mcu_irq_disable_w )
 
 static WRITE8_HANDLER( voice_w )
 {
-	DAC_signed_data_16_w(0, data ? (data + 1) * 0x100 : 0x8000);
+	dac_signed_data_16_w(0, data ? (data + 1) * 0x100 : 0x8000);
 }
 
 
@@ -200,8 +200,8 @@ static ADDRESS_MAP_START( m6502_a_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0100, 0x01ff) AM_RAM
 	AM_RANGE(0x0200, 0x02ff) AM_RAM
 	AM_RANGE(0x0300, 0x030f) AM_RAM
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x3000, 0x30ff) AM_RAM AM_SHARE(3)
 	AM_RANGE(0x3c01, 0x3c01) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x8000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c
index f3c4dab7b27..85c619a7c47 100644
--- a/src/mame/drivers/tecmo.c
+++ b/src/mame/drivers/tecmo.c
@@ -198,8 +198,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( rygar_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(tecmo_adpcm_start_w)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(tecmo_adpcm_end_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(tecmo_adpcm_vol_w)
@@ -217,8 +217,8 @@ static ADDRESS_MAP_START( tecmo_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 									/* writes code to this area */
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(tecmo_adpcm_start_w)
 	AM_RANGE(0xc400, 0xc400) AM_WRITE(tecmo_adpcm_end_w)
 	AM_RANGE(0xc800, 0xc800) AM_WRITE(tecmo_adpcm_vol_w)
diff --git a/src/mame/drivers/tecmo16.c b/src/mame/drivers/tecmo16.c
index 363eb102da1..fe4f1a9eeee 100644
--- a/src/mame/drivers/tecmo16.c
+++ b/src/mame/drivers/tecmo16.c
@@ -149,7 +149,7 @@ static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
 	AM_RANGE(0xf000, 0xfbff) AM_READ(SMH_RAM)	/* Sound RAM */
 	AM_RANGE(0xfc00, 0xfc00) AM_READ(okim6295_status_0_r)
-	AM_RANGE(0xfc05, 0xfc05) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xfc05, 0xfc05) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xfc08, 0xfc08) AM_READ(soundlatch_r)
 	AM_RANGE(0xfc0c, 0xfc0c) AM_READ(SMH_NOP)
 	AM_RANGE(0xfffe, 0xffff) AM_READ(SMH_RAM)
@@ -159,8 +159,8 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xfbff) AM_WRITE(SMH_RAM)	/* Sound RAM */
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(okim6295_data_0_w)
-	AM_RANGE(0xfc04, 0xfc04) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xfc05, 0xfc05) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xfc04, 0xfc04) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xfc05, 0xfc05) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xfc0c, 0xfc0c) AM_WRITE(SMH_NOP)
 	AM_RANGE(0xfffe, 0xffff) AM_WRITE(SMH_RAM)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index bab94b8f871..79234ac3583 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -555,9 +555,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YMF262_status_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ymf262_status_0_r)
 	AM_RANGE(0x40, 0x40) AM_READ(soundlatch_r)
-	AM_RANGE(0x60, 0x60) AM_READ(YMZ280B_status_0_r)
+	AM_RANGE(0x60, 0x60) AM_READ(ymz280b_status_0_r)
 ADDRESS_MAP_END
 
 
@@ -573,10 +573,10 @@ static WRITE8_HANDLER( tecmosys_oki_bank_w )
 
 static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YMF262_register_A_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YMF262_data_A_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(YMF262_register_B_0_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(YMF262_data_B_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ymf262_register_a_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ymf262_data_a_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ymf262_register_b_0_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ymf262_data_b_0_w)
 
 	AM_RANGE(0x10, 0x10) AM_WRITE(okim6295_data_0_w)
 	AM_RANGE(0x20, 0x20) AM_WRITE(tecmosys_oki_bank_w)
@@ -585,8 +585,8 @@ static ADDRESS_MAP_START( writeport, ADDRESS_SPACE_IO, 8 )
 
 	AM_RANGE(0x50, 0x50) AM_WRITE(soundlatch2_w)
 
-	AM_RANGE(0x60, 0x60) AM_WRITE(YMZ280B_register_0_w)
-	AM_RANGE(0x61, 0x61) AM_WRITE(YMZ280B_data_0_w)
+	AM_RANGE(0x60, 0x60) AM_WRITE(ymz280b_register_0_w)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ymz280b_data_0_w)
 ADDRESS_MAP_END
 
 static VIDEO_START(deroon)
diff --git a/src/mame/drivers/tehkanwc.c b/src/mame/drivers/tehkanwc.c
index 5d9851c3ae8..293d3c6549c 100644
--- a/src/mame/drivers/tehkanwc.c
+++ b/src/mame/drivers/tehkanwc.c
@@ -286,10 +286,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_port, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/terracre.c b/src/mame/drivers/terracre.c
index 7934a9967b3..cba2aa94c20 100644
--- a/src/mame/drivers/terracre.c
+++ b/src/mame/drivers/terracre.c
@@ -272,18 +272,18 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport_3526, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3526_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3526_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(DAC_0_signed_data_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(DAC_1_signed_data_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3526_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3526_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(dac_0_signed_data_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(dac_1_signed_data_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_writeport_2203, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(DAC_0_signed_data_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(DAC_1_signed_data_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(dac_0_signed_data_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(dac_1_signed_data_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( terracre )
diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c
index 7329f958a67..6b6112612ba 100644
--- a/src/mame/drivers/tetrisp2.c
+++ b/src/mame/drivers/tetrisp2.c
@@ -148,15 +148,15 @@ static WRITE16_HANDLER( rocknms_sub_systemregs_w )
 
 static READ16_HANDLER( tetrisp2_sound_r )
 {
-	return YMZ280B_status_0_r(machine,offset);
+	return ymz280b_status_0_r(machine,offset);
 }
 
 static WRITE16_HANDLER( tetrisp2_sound_w )
 {
 	if (ACCESSING_BITS_0_7)
 	{
-		if (offset)	YMZ280B_data_0_w     (machine, offset, data & 0xff);
-		else		YMZ280B_register_0_w (machine, offset, data & 0xff);
+		if (offset)	ymz280b_data_0_w     (machine, offset, data & 0xff);
+		else		ymz280b_register_0_w (machine, offset, data & 0xff);
 	}
 }
 
diff --git a/src/mame/drivers/thedeep.c b/src/mame/drivers/thedeep.c
index 70f7afc9979..1970305ceca 100644
--- a/src/mame/drivers/thedeep.c
+++ b/src/mame/drivers/thedeep.c
@@ -177,8 +177,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
-	AM_RANGE(0x0800, 0x0800) AM_WRITE(YM2203_control_port_0_w	)	// YM2203
-	AM_RANGE(0x0801, 0x0801) AM_WRITE(YM2203_write_port_0_w		)	//
+	AM_RANGE(0x0800, 0x0800) AM_WRITE(ym2203_control_port_0_w	)	// YM2203
+	AM_RANGE(0x0801, 0x0801) AM_WRITE(ym2203_write_port_0_w		)	//
 	AM_RANGE(0x3000, 0x3000) AM_READ(soundlatch_r				)	// From Main CPU
 	AM_RANGE(0x8000, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/thepit.c b/src/mame/drivers/thepit.c
index 027b7757851..d37a5608cf8 100644
--- a/src/mame/drivers/thepit.c
+++ b/src/mame/drivers/thepit.c
@@ -215,10 +215,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( audio_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w)
-	AM_RANGE(0x8c, 0x8c) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8d, 0x8d) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8f, 0x8f) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
+	AM_RANGE(0x8c, 0x8c) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8d, 0x8d) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x8e, 0x8e) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8f, 0x8f) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/thief.c b/src/mame/drivers/thief.c
index 59700381f40..80d68230d69 100644
--- a/src/mame/drivers/thief.c
+++ b/src/mame/drivers/thief.c
@@ -193,10 +193,10 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x30, 0x30) AM_WRITE(thief_input_select_w) /* 8255 */
 	AM_RANGE(0x31, 0x31) AM_READ(thief_io_r) 	/* 8255 */
 	AM_RANGE(0x33, 0x33) AM_WRITE(tape_control_w)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x42, 0x42) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x43, 0x43) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x42, 0x42) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x43, 0x43) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
 	AM_RANGE(0x50, 0x50) AM_WRITE(thief_color_plane_w)
 	AM_RANGE(0x60, 0x6f) AM_WRITE(thief_vtcsel_w)
 	AM_RANGE(0x70, 0x7f) AM_WRITE(thief_color_map_w)
diff --git a/src/mame/drivers/thunderx.c b/src/mame/drivers/thunderx.c
index 4f4284ba98f..1da48135c35 100644
--- a/src/mame/drivers/thunderx.c
+++ b/src/mame/drivers/thunderx.c
@@ -432,15 +432,15 @@ static ADDRESS_MAP_START( scontra_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)				/* RAM */
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)			/* soundlatch_r */
 	AM_RANGE(0xb000, 0xb00d) AM_READ(k007232_read_port_0_r)	/* 007232 registers */
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)	/* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)	/* YM2151 */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( scontra_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)					/* ROM */
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)					/* RAM */
 	AM_RANGE(0xb000, 0xb00d) AM_WRITE(k007232_write_port_0_w)		/* 007232 registers */
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)	/* YM2151 */
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)		/* YM2151 */
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)	/* YM2151 */
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)		/* YM2151 */
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(scontra_snd_bankswitch_w)	/* 007232 bank select */
 ADDRESS_MAP_END
 
@@ -448,14 +448,14 @@ static ADDRESS_MAP_START( thunderx_readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
-	AM_RANGE(0xc001, 0xc001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xc001, 0xc001) AM_READ(ym2151_status_port_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( thunderx_writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ym2151_data_port_0_w)
 ADDRESS_MAP_END
 
 /***************************************************************************
diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c
index 795e1869981..ce05944ba21 100644
--- a/src/mame/drivers/tickee.c
+++ b/src/mame/drivers/tickee.c
@@ -213,10 +213,10 @@ static ADDRESS_MAP_START( tickee_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
 	AM_RANGE(0x04000000, 0x04003fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x04100000, 0x041000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w)
-	AM_RANGE(0x04200000, 0x0420000f) AM_READWRITE(AY8910_read_port_0_lsb_r, AY8910_control_port_0_lsb_w)
-	AM_RANGE(0x04200010, 0x0420001f) AM_WRITE(AY8910_write_port_0_lsb_w)
-	AM_RANGE(0x04200100, 0x0420010f) AM_READWRITE(AY8910_read_port_1_lsb_r, AY8910_control_port_1_lsb_w)
-	AM_RANGE(0x04200110, 0x0420011f) AM_WRITE(AY8910_write_port_1_lsb_w)
+	AM_RANGE(0x04200000, 0x0420000f) AM_READWRITE(ay8910_read_port_0_lsb_r, ay8910_control_port_0_lsb_w)
+	AM_RANGE(0x04200010, 0x0420001f) AM_WRITE(ay8910_write_port_0_lsb_w)
+	AM_RANGE(0x04200100, 0x0420010f) AM_READWRITE(ay8910_read_port_1_lsb_r, ay8910_control_port_1_lsb_w)
+	AM_RANGE(0x04200110, 0x0420011f) AM_WRITE(ay8910_write_port_1_lsb_w)
 	AM_RANGE(0x04400000, 0x0440007f) AM_WRITE(tickee_control_w) AM_BASE(&tickee_control)
 	AM_RANGE(0x04400040, 0x0440004f) AM_READ_PORT("IN2")
 	AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
@@ -231,10 +231,10 @@ static ADDRESS_MAP_START( ghoshunt_map, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x02000000, 0x02ffffff) AM_ROM AM_REGION("user1", 0)
 	AM_RANGE(0x04100000, 0x04103fff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size)
 	AM_RANGE(0x04200000, 0x042000ff) AM_READWRITE(tlc34076_lsb_r, tlc34076_lsb_w)
-	AM_RANGE(0x04300000, 0x0430000f) AM_READWRITE(AY8910_read_port_0_lsb_r, AY8910_control_port_0_lsb_w)
-	AM_RANGE(0x04300010, 0x0430001f) AM_WRITE(AY8910_write_port_0_lsb_w)
-	AM_RANGE(0x04300100, 0x0430010f) AM_READWRITE(AY8910_read_port_1_lsb_r, AY8910_control_port_1_lsb_w)
-	AM_RANGE(0x04300110, 0x0430011f) AM_WRITE(AY8910_write_port_1_lsb_w)
+	AM_RANGE(0x04300000, 0x0430000f) AM_READWRITE(ay8910_read_port_0_lsb_r, ay8910_control_port_0_lsb_w)
+	AM_RANGE(0x04300010, 0x0430001f) AM_WRITE(ay8910_write_port_0_lsb_w)
+	AM_RANGE(0x04300100, 0x0430010f) AM_READWRITE(ay8910_read_port_1_lsb_r, ay8910_control_port_1_lsb_w)
+	AM_RANGE(0x04300110, 0x0430011f) AM_WRITE(ay8910_write_port_1_lsb_w)
 	AM_RANGE(0x04500000, 0x0450007f) AM_WRITE(tickee_control_w) AM_BASE(&tickee_control)
 	AM_RANGE(0xc0000000, 0xc00001ff) AM_READWRITE(tms34010_io_register_r, tms34010_io_register_w)
 	AM_RANGE(0xc0000240, 0xc000025f) AM_WRITENOP		/* seems to be a bug in their code */
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index 30598265656..1e33be450c2 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -190,10 +190,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
-	AM_RANGE(0x8000, 0x8000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0xa000, 0xa000) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0xa001, 0xa001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0xa001, 0xa001) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/timelimt.c b/src/mame/drivers/timelimt.c
index c71991282ea..3a0147222a7 100644
--- a/src/mame/drivers/timelimt.c
+++ b/src/mame/drivers/timelimt.c
@@ -98,17 +98,17 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readport_sound, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x8c, 0x8d) AM_READ(AY8910_read_port_0_r)
-	AM_RANGE(0x8e, 0x8f) AM_READ(AY8910_read_port_1_r)
+	AM_RANGE(0x8c, 0x8d) AM_READ(ay8910_read_port_0_r)
+	AM_RANGE(0x8e, 0x8f) AM_READ(ay8910_read_port_1_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport_sound, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(soundlatch_clear_w)
-	AM_RANGE(0x8c, 0x8c) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8d, 0x8d) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x8e, 0x8e) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x8f, 0x8f) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x8c, 0x8c) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8d, 0x8d) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x8e, 0x8e) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x8f, 0x8f) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 /***************************************************************************/
diff --git a/src/mame/drivers/tmnt.c b/src/mame/drivers/tmnt.c
index ef4a4b26b40..e7f690bb099 100644
--- a/src/mame/drivers/tmnt.c
+++ b/src/mame/drivers/tmnt.c
@@ -686,18 +686,18 @@ static WRITE16_HANDLER( prmrsocr_eeprom_w )
 
 static READ16_HANDLER( cuebrick_snd_r )
 {
-	return YM2151_status_port_0_r(machine,0)<<8;
+	return ym2151_status_port_0_r(machine,0)<<8;
 }
 
 static WRITE16_HANDLER( cuebrick_snd_w )
 {
 	if (offset)
 	{
-		YM2151_data_port_0_w(machine, 0, data>>8);
+		ym2151_data_port_0_w(machine, 0, data>>8);
 	}
 	else
 	{
-		YM2151_register_port_0_w(machine, 0, data>>8);
+		ym2151_register_port_0_w(machine, 0, data>>8);
 	}
 }
 
@@ -1227,8 +1227,8 @@ static ADDRESS_MAP_START( mia_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READWRITE(k007232_read_port_0_r, k007232_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -1238,8 +1238,8 @@ static ADDRESS_MAP_START( tmnt_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9000, 0x9000) AM_READWRITE(tmnt_sres_r, tmnt_sres_w)	/* title music & UPD7759C reset */
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READWRITE(k007232_read_port_0_r, k007232_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(upd7759_0_port_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(upd7759_0_start_w)
 	AM_RANGE(0xf000, 0xf000) AM_READ(upd7759_0_busy_r)
@@ -1249,8 +1249,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( punkshot_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w)
 	AM_RANGE(0xfc00, 0xfc2f) AM_READWRITE(k053260_0_r, k053260_0_w)
 ADDRESS_MAP_END
@@ -1259,8 +1259,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( lgtnfght_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0xa000, 0xa000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xa001, 0xa001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xa000, 0xa000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xa001, 0xa001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xc000, 0xc02f) AM_READWRITE(k053260_0_r, k053260_0_w)
 ADDRESS_MAP_END
 
@@ -1276,8 +1276,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( ssriders_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa2f) AM_READWRITE(k053260_0_r, k053260_0_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_WRITE(sound_arm_nmi_w)
 ADDRESS_MAP_END
@@ -1286,8 +1286,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( thndrx2_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
-	AM_RANGE(0xf800, 0xf800) AM_MIRROR(0x0010) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_MIRROR(0x0010) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_MIRROR(0x0010) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_MIRROR(0x0010) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa00) AM_WRITE(sound_arm_nmi_w)
 	AM_RANGE(0xfc00, 0xfc2f) AM_READWRITE(k053260_0_r, k053260_0_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 3878610797a..d37d4b01166 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -373,7 +373,7 @@ static WRITE8_HANDLER( kabukiz_sample_w )
 {
 	// to avoid the write when the sound chip is initialized
 	if(data != 0xff)
-		DAC_0_data_w(machine, 0, data);
+		dac_0_data_w(machine, 0, data);
 }
 
 static ADDRESS_MAP_START( readmem, ADDRESS_SPACE_PROGRAM, 8 )
@@ -419,8 +419,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sub_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2)
-	AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xb001, 0xb001) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xb000, 0xb000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xb001, 0xb001) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0xc000, 0xc001) AM_READ(tnzs_mcu_r)	/* plain input ports in insectx (memory handler */
 									/* changed in insectx_init() ) */
 	AM_RANGE(0xd000, 0xdfff) AM_READ(SMH_RAM)
@@ -433,8 +433,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sub_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
-	AM_RANGE(0xb000, 0xb000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xb001, 0xb001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xb000, 0xb000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xb001, 0xb001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xc000, 0xc001) AM_WRITE(tnzs_mcu_w)	/* not present in insectx */
 	AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w)
@@ -443,8 +443,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( kageki_sub_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x9fff) AM_READ(SMH_BANK2)
-	AM_RANGE(0xb000, 0xb000) AM_READ(YM2203_status_port_0_r)
-	AM_RANGE(0xb001, 0xb001) AM_READ(YM2203_read_port_0_r)
+	AM_RANGE(0xb000, 0xb000) AM_READ(ym2203_status_port_0_r)
+	AM_RANGE(0xb001, 0xb001) AM_READ(ym2203_read_port_0_r)
 	AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN0")
 	AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN1")
 	AM_RANGE(0xc002, 0xc002) AM_READ_PORT("IN2")
@@ -455,8 +455,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( kageki_sub_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x9fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(tnzs_bankswitch1_w)
-	AM_RANGE(0xb000, 0xb000) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0xb001, 0xb001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0xb000, 0xb000) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0xb001, 0xb001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xd000, 0xdfff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xe000, 0xefff) AM_WRITE(tnzs_sharedram_w)
 ADDRESS_MAP_END
@@ -513,14 +513,14 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tnzsb_readport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READ(YM2203_status_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_READ(ym2203_status_port_0_r)
 	AM_RANGE(0x02, 0x02) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tnzsb_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym2203_write_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -603,8 +603,8 @@ static ADDRESS_MAP_START( jpopnics_sub_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x9fff) AM_READWRITE(SMH_BANK2, SMH_ROM)
 
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(jpopnics_subbankswitch_w)
-	AM_RANGE(0xb000, 0xb000) AM_READ_PORT("IN0") AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xb001, 0xb001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xb000, 0xb000) AM_READ_PORT("IN0") AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xb001, 0xb001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xc000, 0xc000) AM_READ_PORT("IN1")
 	AM_RANGE(0xc001, 0xc001) AM_READ_PORT("IN2")
 	AM_RANGE(0xc600, 0xc600) AM_READ_PORT("DSWA")
diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c
index aac2c994b97..0c3809c5005 100644
--- a/src/mame/drivers/toaplan1.c
+++ b/src/mame/drivers/toaplan1.c
@@ -280,8 +280,8 @@ static ADDRESS_MAP_START( rallybik_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x30, 0x30) AM_WRITE(rallybik_coin_w)	/* Coin counter/lockout */
 	AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA")
 	AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB")
-	AM_RANGE(0x60, 0x60) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x61, 0x61) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x60, 0x60) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP")
 ADDRESS_MAP_END
 
@@ -293,8 +293,8 @@ static ADDRESS_MAP_START( truxton_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x30, 0x30) AM_WRITE(toaplan1_coin_w)	/* Coin counter/lockout */
 	AM_RANGE(0x40, 0x40) AM_READ_PORT("DSWA")
 	AM_RANGE(0x50, 0x50) AM_READ_PORT("DSWB")
-	AM_RANGE(0x60, 0x60) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x61, 0x61) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x60, 0x60) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x61, 0x61) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x70, 0x70) AM_READ_PORT("TJUMP")
 ADDRESS_MAP_END
 
@@ -307,8 +307,8 @@ static ADDRESS_MAP_START( hellfire_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x40, 0x40) AM_READ_PORT("P1")
 	AM_RANGE(0x50, 0x50) AM_READ_PORT("P2")
 	AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM")
-	AM_RANGE(0x70, 0x70) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x71, 0x71) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x70, 0x70) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x71, 0x71) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 )
@@ -320,14 +320,14 @@ static ADDRESS_MAP_START( zerowing_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x80, 0x80) AM_READ_PORT("SYSTEM")
 	AM_RANGE(0x88, 0x88) AM_READ_PORT("TJUMP")
 	AM_RANGE(0xa0, 0xa0) AM_WRITE(toaplan1_coin_w)	/* Coin counter/lockout */
-	AM_RANGE(0xa8, 0xa8) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0xa9, 0xa9) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xa8, 0xa8) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0xa9, 0xa9) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( demonwld_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x20, 0x20) AM_READ_PORT("TJUMP")
 	AM_RANGE(0x40, 0x40) AM_WRITE(toaplan1_coin_w)	/* Coin counter/lockout */
 	AM_RANGE(0x60, 0x60) AM_READ_PORT("SYSTEM")
@@ -339,8 +339,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( outzone_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x04, 0x04) AM_WRITE(toaplan1_coin_w)	/* Coin counter/lockout */
 	AM_RANGE(0x08, 0x08) AM_READ_PORT("DSWA")
 	AM_RANGE(0x0c, 0x0c) AM_READ_PORT("DSWB")
diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index a4797dd4002..515a5ecd12d 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -1529,8 +1529,8 @@ static ADDRESS_MAP_START( truxton2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x700008, 0x700009) AM_READ_PORT("IN2")
 	AM_RANGE(0x70000a, 0x70000b) AM_READ_PORT("SYS")
 	AM_RANGE(0x700010, 0x700011) AM_READWRITE(okim6295_status_0_lsb_r, okim6295_data_0_lsb_w)
-	AM_RANGE(0x700014, 0x700015) AM_WRITE(YM2151_register_port_0_lsb_w)
-	AM_RANGE(0x700016, 0x700017) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_data_port_0_lsb_w)
+	AM_RANGE(0x700014, 0x700015) AM_WRITE(ym2151_register_port_0_lsb_w)
+	AM_RANGE(0x700016, 0x700017) AM_READWRITE(ym2151_status_port_0_lsb_r, ym2151_data_port_0_lsb_w)
 	AM_RANGE(0x70001e, 0x70001f) AM_WRITE(toaplan2_coin_word_w)		/* Coin count/lock */
 ADDRESS_MAP_END
 
@@ -1767,8 +1767,8 @@ static ADDRESS_MAP_START( snowbro2_68k_mem, ADDRESS_SPACE_PROGRAM, 16 )
 	AM_RANGE(0x300008, 0x300009) AM_WRITE(toaplan2_0_scroll_reg_select_w)
 	AM_RANGE(0x30000c, 0x30000d) AM_READWRITE(toaplan2_inputport_0_word_r, toaplan2_0_scroll_reg_data_w)	/* VBlank */
 	AM_RANGE(0x400000, 0x400fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)
-	AM_RANGE(0x500000, 0x500001) AM_WRITE(YM2151_register_port_0_lsb_w)
-	AM_RANGE(0x500002, 0x500003) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_data_port_0_lsb_w)
+	AM_RANGE(0x500000, 0x500001) AM_WRITE(ym2151_register_port_0_lsb_w)
+	AM_RANGE(0x500002, 0x500003) AM_READWRITE(ym2151_status_port_0_lsb_r, ym2151_data_port_0_lsb_w)
 	AM_RANGE(0x600000, 0x600001) AM_READWRITE(okim6295_status_0_lsb_r, okim6295_data_0_lsb_w)
 	AM_RANGE(0x700000, 0x700001) AM_READ_PORT("JMPR")
 	AM_RANGE(0x700004, 0x700005) AM_READ_PORT("DSWA")
@@ -1928,16 +1928,16 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM AM_BASE(&toaplan2_shared_ram)
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( raizing_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xe004, 0xe004) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xe00e, 0xe00e) AM_WRITE(toaplan2_coin_w)
 ADDRESS_MAP_END
@@ -1947,8 +1947,8 @@ static ADDRESS_MAP_START( bgaregga_sound_z80_mem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(1)
 	AM_RANGE(0xc000, 0xdfff) AM_RAM AM_BASE(&raizing_shared_ram)
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xe004, 0xe004) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0xe006, 0xe006) AM_WRITE(raizing_okim6295_bankselect_0)
 	AM_RANGE(0xe008, 0xe008) AM_WRITE(raizing_okim6295_bankselect_1)
@@ -1974,8 +1974,8 @@ static ADDRESS_MAP_START( batrider_sound_z80_port, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x46, 0x46) AM_WRITE(raizing_clear_nmi_w)
 	AM_RANGE(0x48, 0x48) AM_READ(soundlatch_r)
 	AM_RANGE(0x4a, 0x4a) AM_READ(soundlatch2_r)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x81, 0x81) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x81, 0x81) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x82, 0x82) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x84, 0x84) AM_READWRITE(okim6295_status_1_r, okim6295_data_1_w)
 	AM_RANGE(0x88, 0x88) AM_WRITE(batrider_bankswitch_w)
@@ -2001,8 +2001,8 @@ static ADDRESS_MAP_START( bbakraid_sound_z80_port, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x46, 0x46) AM_WRITE(raizing_clear_nmi_w)
 	AM_RANGE(0x48, 0x48) AM_READ(soundlatch_r)
 	AM_RANGE(0x4a, 0x4a) AM_READ(soundlatch2_r)
-	AM_RANGE(0x80, 0x80) AM_WRITE(YMZ280B_register_0_w)
-	AM_RANGE(0x81, 0x81) AM_READWRITE(YMZ280B_status_0_r, YMZ280B_data_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ymz280b_register_0_w)
+	AM_RANGE(0x81, 0x81) AM_READWRITE(ymz280b_status_0_r, ymz280b_data_0_w)
 ADDRESS_MAP_END
 
 
@@ -2022,8 +2022,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( V25_mem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x00000, 0x03fff) AM_ROM
 //  AM_RANGE(0x00000, 0x007ff) AM_RAM                           /* External shared RAM (Banked) */
-	AM_RANGE(0x04000, 0x04000) AM_READWRITE(YM2151_status_port_0_r, YM2151_register_port_0_w)
-	AM_RANGE(0x04001, 0x04001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x04000, 0x04000) AM_READWRITE(ym2151_status_port_0_r, ym2151_register_port_0_w)
+	AM_RANGE(0x04001, 0x04001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x04002, 0x04002) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 //  AM_RANGE(0x04004, 0x04004) AM_WRITE(oki_bankswitch_w)
 	AM_RANGE(0x04008, 0x04008) AM_READ_PORT("IN1")
@@ -2053,8 +2053,8 @@ ADDRESS_MAP_END
 
 
 static ADDRESS_MAP_START( V25_rambased_mem, ADDRESS_SPACE_PROGRAM, 8 )
-	AM_RANGE(0x00000, 0x00000) AM_WRITE( YM2151_register_port_0_w )
-	AM_RANGE(0x00001, 0x00001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00000, 0x00000) AM_WRITE( ym2151_register_port_0_w )
+	AM_RANGE(0x00001, 0x00001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 
 	AM_RANGE(0x07800, 0x07fff) AM_RAM AM_SHARE(6)
 
@@ -3418,7 +3418,7 @@ static const ym3812_interface ym3812_config =
 	irqhandler
 };
 
-static const struct YMZ280Binterface ymz280b_interface =
+static const ymz280b_interface ymz280b_config =
 {
 	bbakraid_irqhandler
 };
@@ -4203,7 +4203,7 @@ static MACHINE_DRIVER_START( bbakraid )
 	MDRV_SPEAKER_STANDARD_MONO("mono")
 
 	MDRV_SOUND_ADD("ymz", YMZ280B, 16934400)
-	MDRV_SOUND_CONFIG(ymz280b_interface)
+	MDRV_SOUND_CONFIG(ymz280b_config)
 	MDRV_SOUND_ROUTE(0, "mono", 1.0)
 	MDRV_SOUND_ROUTE(1, "mono", 1.0)
 MACHINE_DRIVER_END
diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c
index dca8c8739fb..df8c2ba8832 100644
--- a/src/mame/drivers/toki.c
+++ b/src/mame/drivers/toki.c
@@ -151,10 +151,10 @@ static ADDRESS_MAP_START( tokib_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(toki_adpcm_control_w)	/* MSM5205 + ROM bank */
 	AM_RANGE(0xe400, 0xe400) AM_WRITE(toki_adpcm_data_w)
-	AM_RANGE(0xec00, 0xec00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0xec01, 0xec01) AM_WRITE(YM3812_write_port_0_w)
-	AM_RANGE(0xec08, 0xec08) AM_WRITE(YM3812_control_port_0_w)	/* mirror address, it seems */
-	AM_RANGE(0xec09, 0xec09) AM_WRITE(YM3812_write_port_0_w)	/* mirror address, it seems */
+	AM_RANGE(0xec00, 0xec00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0xec01, 0xec01) AM_WRITE(ym3812_write_port_0_w)
+	AM_RANGE(0xec08, 0xec08) AM_WRITE(ym3812_control_port_0_w)	/* mirror address, it seems */
+	AM_RANGE(0xec09, 0xec09) AM_WRITE(ym3812_write_port_0_w)	/* mirror address, it seems */
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/topspeed.c b/src/mame/drivers/topspeed.c
index 4baaf332711..f9f6b802cb9 100644
--- a/src/mame/drivers/topspeed.c
+++ b/src/mame/drivers/topspeed.c
@@ -509,15 +509,15 @@ static ADDRESS_MAP_START( z80_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)
 	AM_RANGE(0x8000, 0x8fff) AM_READ(SMH_RAM)
-	AM_RANGE(0x9001, 0x9001) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x9001, 0x9001) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(taitosound_slave_comm_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( z80_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x8fff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x9000, 0x9000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0xa001, 0xa001) AM_WRITE(taitosound_slave_comm_w)
 	AM_RANGE(0xb000, 0xb000) AM_WRITE(topspeed_msm5205_address_w)
diff --git a/src/mame/drivers/trackfld.c b/src/mame/drivers/trackfld.c
index 55f358df758..124a6ab8d1c 100644
--- a/src/mame/drivers/trackfld.c
+++ b/src/mame/drivers/trackfld.c
@@ -270,14 +270,14 @@ static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(sn76496_0_w)	/* Loads the snd command into the snd latch */
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP)		/* This address triggers the SN chip to read the data port. */
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(dac_0_data_w)
 /* There are lots more addresses which are used for setting a two bit volume
     controls for speech and music
 
     Currently these are un-supported by Mame
 */
 	AM_RANGE(0xe001, 0xe001) AM_WRITE(SMH_NOP) /* watch dog ? */
-	AM_RANGE(0xe004, 0xe004) AM_WRITE(VLM5030_data_w)
+	AM_RANGE(0xe004, 0xe004) AM_WRITE(vlm5030_data_w)
 	AM_RANGE(0xe000, 0xefff) AM_WRITE(trackfld_sound_w) /* e003 speech control */
 ADDRESS_MAP_END
 
@@ -294,7 +294,7 @@ static ADDRESS_MAP_START( hyprolyb_sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x43ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(sn76496_0_w)	/* Loads the snd command into the snd latch */
 	AM_RANGE(0xc000, 0xc000) AM_WRITE(SMH_NOP)		/* This address triggers the SN chip to read the data port. */
-	AM_RANGE(0xe000, 0xe000) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0xe000, 0xe000) AM_WRITE(dac_0_data_w)
 /* There are lots more addresses which are used for setting a two bit volume
     controls for speech and music
 
diff --git a/src/mame/drivers/truco.c b/src/mame/drivers/truco.c
index b2dc45d1f13..2b1aef2cd56 100644
--- a/src/mame/drivers/truco.c
+++ b/src/mame/drivers/truco.c
@@ -35,7 +35,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x7c00, 0x7fff) AM_RAM AM_BASE(&battery_ram)				/* battery backed ram */
 	AM_RANGE(0x8000, 0x8000) AM_READ_PORT("P1") AM_WRITENOP				/* controls (and irq ack?) */
 	AM_RANGE(0x8001, 0x8001) AM_READWRITE(SMH_NOP, SMH_NOP)				/* unknown */
-	AM_RANGE(0x8002, 0x8002) AM_READ_PORT("DSW") AM_WRITE(DAC_0_data_w)	/* dipswitches */
+	AM_RANGE(0x8002, 0x8002) AM_READ_PORT("DSW") AM_WRITE(dac_0_data_w)	/* dipswitches */
 	AM_RANGE(0x8003, 0x8007) AM_READWRITE(SMH_NOP, SMH_NOP)				/* unknown */
 	AM_RANGE(0x8008, 0xffff) AM_ROM
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/trucocl.c b/src/mame/drivers/trucocl.c
index 0e30d7afc18..b2f1c12083a 100644
--- a/src/mame/drivers/trucocl.c
+++ b/src/mame/drivers/trucocl.c
@@ -80,7 +80,7 @@ static WRITE8_HANDLER( audio_dac_w)
 
 	dac_address += 0x10000;
 
-	DAC_data_w( 0, rom[dac_address+cur_dac_address_index] );
+	dac_data_w( 0, rom[dac_address+cur_dac_address_index] );
 
 	timer_set( ATTOTIME_IN_HZ( 16000 ), NULL, 0, dac_irq );
 }
diff --git a/src/mame/drivers/trvmadns.c b/src/mame/drivers/trvmadns.c
index 9072e38c748..9b1da186820 100644
--- a/src/mame/drivers/trvmadns.c
+++ b/src/mame/drivers/trvmadns.c
@@ -210,8 +210,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_READ(input_port_0_r)
 	AM_RANGE(0x80, 0x80) AM_WRITE(trvmadns_banking_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/trvquest.c b/src/mame/drivers/trvquest.c
index 1e1b5a93baa..69ee558a795 100644
--- a/src/mame/drivers/trvquest.c
+++ b/src/mame/drivers/trvquest.c
@@ -62,10 +62,10 @@ static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x3800, 0x380f) AM_READWRITE(via_1_r, via_1_w)
 	AM_RANGE(0x3810, 0x381f) AM_READWRITE(via_2_r, via_2_w)
 	AM_RANGE(0x3820, 0x382f) AM_READWRITE(via_0_r, via_0_w)
-	AM_RANGE(0x3830, 0x3830) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x3831, 0x3831) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x3840, 0x3840) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x3841, 0x3841) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x3830, 0x3830) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x3831, 0x3831) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x3840, 0x3840) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x3841, 0x3841) AM_WRITE(ay8910_write_port_1_w)
 	AM_RANGE(0x3850, 0x3850) AM_READNOP //watchdog_reset_r ?
 	AM_RANGE(0x8000, 0x9fff) AM_READ(trvquest_question_r)
 	AM_RANGE(0xa000, 0xa000) AM_WRITE(SMH_RAM) AM_BASE_MEMBER(gameplan_state, trvquest_question)
diff --git a/src/mame/drivers/tryout.c b/src/mame/drivers/tryout.c
index 31cfeaf581a..6ade8da6542 100644
--- a/src/mame/drivers/tryout.c
+++ b/src/mame/drivers/tryout.c
@@ -76,8 +76,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
-	AM_RANGE(0x4000, 0x4000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(YM2203_write_port_0_w)
+	AM_RANGE(0x4000, 0x4000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ym2203_write_port_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(tryout_sound_irq_ack_w)
 	AM_RANGE(0xc000, 0xffff) AM_ROM
diff --git a/src/mame/drivers/tsamurai.c b/src/mame/drivers/tsamurai.c
index 4dbd360d0b9..aa69f83db7d 100644
--- a/src/mame/drivers/tsamurai.c
+++ b/src/mame/drivers/tsamurai.c
@@ -231,8 +231,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( z80_writeport, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( z80_writeport_m660, ADDRESS_SPACE_IO, 8 )
@@ -249,7 +249,7 @@ static READ8_HANDLER( sound_command1_r )
 
 static WRITE8_HANDLER( sound_out1_w )
 {
-	DAC_data_w(0,data);
+	dac_data_w(0,data);
 }
 
 static READ8_HANDLER( sound_command2_r ){
@@ -258,7 +258,7 @@ static READ8_HANDLER( sound_command2_r ){
 
 static WRITE8_HANDLER( sound_out2_w )
 {
-	DAC_data_w(1,data);
+	dac_data_w(1,data);
 }
 
 static READ8_HANDLER( sound_command3_r ){
@@ -332,8 +332,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writeport_sound3_m660, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( readmem_sound3_m660, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/tubep.c b/src/mame/drivers/tubep.c
index cda136b498d..7d642583b4f 100644
--- a/src/mame/drivers/tubep.c
+++ b/src/mame/drivers/tubep.c
@@ -258,12 +258,12 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tubep_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x04, 0x04) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x05, 0x05) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x04, 0x04) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x05, 0x05) AM_WRITE(ay8910_write_port_2_w)
 	AM_RANGE(0x06, 0x06) AM_READ(tubep_soundlatch_r)
 	AM_RANGE(0x07, 0x07) AM_WRITE(tubep_sound_unknown)
 ADDRESS_MAP_END
@@ -618,12 +618,12 @@ static ADDRESS_MAP_START( rjammer_sound_portmap, ADDRESS_SPACE_IO, 8 )
 	AM_RANGE(0x10, 0x10) AM_WRITE(rjammer_voice_startstop_w)
 	AM_RANGE(0x18, 0x18) AM_WRITE(rjammer_voice_frequency_select_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(rjammer_voice_input_w)
-	AM_RANGE(0x90, 0x90) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x91, 0x91) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x92, 0x92) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0x93, 0x93) AM_WRITE(AY8910_write_port_1_w)
-	AM_RANGE(0x94, 0x94) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x95, 0x95) AM_WRITE(AY8910_write_port_2_w)
+	AM_RANGE(0x90, 0x90) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x91, 0x91) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x92, 0x92) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0x93, 0x93) AM_WRITE(ay8910_write_port_1_w)
+	AM_RANGE(0x94, 0x94) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x95, 0x95) AM_WRITE(ay8910_write_port_2_w)
 	AM_RANGE(0x96, 0x96) AM_WRITE(rjammer_voice_intensity_control_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/tugboat.c b/src/mame/drivers/tugboat.c
index 9e70a511e71..979c0683f9e 100644
--- a/src/mame/drivers/tugboat.c
+++ b/src/mame/drivers/tugboat.c
@@ -186,8 +186,8 @@ static MACHINE_RESET( tugboat )
 
 static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x01ff) AM_RAM AM_BASE(&tugboat_ram)
-	AM_RANGE(0x1060, 0x1060) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x1061, 0x1061) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x1060, 0x1060) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x1061, 0x1061) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x10a0, 0x10a1) AM_WRITE(tugboat_hd46505_0_w)	/* scrolling is performed changing the start_addr register (0C/0D) */
 	AM_RANGE(0x10c0, 0x10c1) AM_WRITE(tugboat_hd46505_1_w)
 	AM_RANGE(0x11e4, 0x11e7) AM_READWRITE(pia_0_r, pia_0_w)
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 2c5f60b138a..6afeb9b5607 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -723,8 +723,8 @@ static ADDRESS_MAP_START( fncywld_main_map, ADDRESS_SPACE_PROGRAM, 16 )
 #else
 	AM_RANGE(0x000000, 0x0fffff) AM_WRITE(SMH_ROM)
 #endif
-	AM_RANGE(0x100000, 0x100001) AM_READWRITE(YM2151_status_port_0_lsb_r, YM2151_register_port_0_lsb_w)
-	AM_RANGE(0x100002, 0x100003) AM_READWRITE(SMH_NOP, YM2151_data_port_0_lsb_w)
+	AM_RANGE(0x100000, 0x100001) AM_READWRITE(ym2151_status_port_0_lsb_r, ym2151_register_port_0_lsb_w)
+	AM_RANGE(0x100002, 0x100003) AM_READWRITE(SMH_NOP, ym2151_data_port_0_lsb_w)
 	AM_RANGE(0x100004, 0x100005) AM_READWRITE(okim6295_status_0_lsb_r, okim6295_data_0_lsb_w)
 	AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(paletteram16_xxxxRRRRGGGGBBBB_word_w) AM_BASE(&paletteram16)
 	AM_RANGE(0x160000, 0x1607ff) AM_RAM AM_BASE(&spriteram16) AM_SIZE(&spriteram_size) /* sprites */
@@ -823,10 +823,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(0,data);
+		ym2151_register_port_0_w(0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(0,data);
+		ym2151_data_port_0_w(0,data);
 		break;
 	}
 }
@@ -853,8 +853,8 @@ static WRITE8_HANDLER( oki_sound_bank_w )
 static ADDRESS_MAP_START( semicom_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xcfff) AM_ROM
 	AM_RANGE(0xd000, 0xd7ff) AM_RAM
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf001, 0xf001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf001, 0xf001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xf002, 0xf002) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 //  AM_RANGE(0xf006, 0xf006) ??
 	AM_RANGE(0xf008, 0xf008) AM_READ(soundlatch_r)
@@ -880,8 +880,8 @@ static READ8_HANDLER(jumppop_z80latch_r)
 
 static ADDRESS_MAP_START( jumppop_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x02, 0x02) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x03, 0x03) AM_READ(jumppop_z80latch_r)
 	AM_RANGE(0x04, 0x04) AM_NOP
diff --git a/src/mame/drivers/tumblep.c b/src/mame/drivers/tumblep.c
index 39a69e374a5..5e08da25be7 100644
--- a/src/mame/drivers/tumblep.c
+++ b/src/mame/drivers/tumblep.c
@@ -131,10 +131,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -143,7 +143,7 @@ static WRITE8_HANDLER( YM2151_w )
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_ROM
 	AM_RANGE(0x100000, 0x100001) AM_NOP	/* YM2203 - this board doesn't have one */
-	AM_RANGE(0x110000, 0x110001) AM_READWRITE(YM2151_status_port_0_r, YM2151_w)
+	AM_RANGE(0x110000, 0x110001) AM_READWRITE(ym2151_status_port_0_r, YM2151_w)
 	AM_RANGE(0x120000, 0x120001) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_NOP	/* This board only has 1 oki chip */
 	AM_RANGE(0x140000, 0x140001) AM_READ(soundlatch_r)
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index e10b10696dc..5b637ccce5b 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -264,8 +264,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9000, 0x9000) AM_READWRITE(twin16_sres_r, twin16_sres_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 	AM_RANGE(0xb000, 0xb00d) AM_READWRITE(k007232_read_port_0_r, k007232_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xd000, 0xd000) AM_WRITE(upd7759_0_port_w)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(upd7759_0_start_w)
 	AM_RANGE(0xf000, 0xf000) AM_READWRITE(upd7759_0_busy_r, SMH_NOP)	// ??? write ???
diff --git a/src/mame/drivers/twincobr.c b/src/mame/drivers/twincobr.c
index ecbbb883259..d769de93ebb 100644
--- a/src/mame/drivers/twincobr.c
+++ b/src/mame/drivers/twincobr.c
@@ -236,8 +236,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 	AM_RANGE(0x10, 0x10) AM_READ(input_port_5_r)		/* Twin Cobra - Coin/Start */
 	AM_RANGE(0x20, 0x20) AM_WRITE(twincobr_coin_w)		/* Twin Cobra coin count-lockout */
 	AM_RANGE(0x40, 0x40) AM_READ(input_port_3_r)		/* Twin Cobra - DSW A */
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 03bda1e1c56..c1a296a24c9 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -84,8 +84,8 @@ static ADDRESS_MAP_START( twins_map, ADDRESS_SPACE_PROGRAM, 16 )
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( twins_io, ADDRESS_SPACE_IO, 16 )
-	AM_RANGE(0x0000, 0x0001) AM_WRITE(AY8910_control_port_0_lsb_w)
-	AM_RANGE(0x0002, 0x0003) AM_READ(AY8910_read_port_0_lsb_r) AM_WRITE(AY8910_write_port_0_lsb_w)
+	AM_RANGE(0x0000, 0x0001) AM_WRITE(ay8910_control_port_0_lsb_w)
+	AM_RANGE(0x0002, 0x0003) AM_READ(ay8910_read_port_0_lsb_r) AM_WRITE(ay8910_write_port_0_lsb_w)
 	AM_RANGE(0x0004, 0x0005) AM_READWRITE(twins_port4_r, twins_port4_w)
 	AM_RANGE(0x0006, 0x0007) AM_WRITE(port6_pal0_w)
 	AM_RANGE(0x000e, 0x000f) AM_WRITE(porte_paloff0_w)
@@ -247,8 +247,8 @@ static ADDRESS_MAP_START( twinsa_io, ADDRESS_SPACE_IO, 16 )
 	AM_RANGE(0x0000, 0x0001) AM_READWRITE(twinsa_unk_r, porte_paloff0_w)
 	AM_RANGE(0x0002, 0x0003) AM_WRITE(porte_paloff0_w)
 	AM_RANGE(0x0004, 0x0005) AM_WRITE(twinsa_port4_w) // palette on this set
-	AM_RANGE(0x0008, 0x0009) AM_WRITE(AY8910_control_port_0_lsb_w)
-	AM_RANGE(0x0010, 0x0011) AM_READWRITE(AY8910_read_port_0_lsb_r, AY8910_write_port_0_lsb_w)
+	AM_RANGE(0x0008, 0x0009) AM_WRITE(ay8910_control_port_0_lsb_w)
+	AM_RANGE(0x0010, 0x0011) AM_READWRITE(ay8910_read_port_0_lsb_r, ay8910_write_port_0_lsb_w)
 	AM_RANGE(0x0018, 0x0019) AM_READ(twins_port4_r) AM_WRITE(twins_port4_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/tx1.c b/src/mame/drivers/tx1.c
index 04bd65b3a20..919969f0256 100644
--- a/src/mame/drivers/tx1.c
+++ b/src/mame/drivers/tx1.c
@@ -473,8 +473,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( tx1_sound_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 
@@ -578,10 +578,10 @@ ADDRESS_MAP_END
 /* Common */
 static ADDRESS_MAP_START( buggyboy_sound_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_READWRITE(AY8910_read_port_1_r, AY8910_write_port_1_w)
-	AM_RANGE(0x81, 0x81) AM_WRITE(AY8910_control_port_1_w)
+	AM_RANGE(0x40, 0x40) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_READWRITE(ay8910_read_port_1_r, ay8910_write_port_1_w)
+	AM_RANGE(0x81, 0x81) AM_WRITE(ay8910_control_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index a680e6e9162..cc68be47ccd 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -167,7 +167,7 @@ static ADDRESS_MAP_START( pce_mem , ADDRESS_SPACE_PROGRAM, 8)
 	AM_RANGE( 0x1F0000, 0x1F1FFF) AM_RAM AM_MIRROR(0x6000) AM_BASE( &pce_user_ram )
 	AM_RANGE( 0x1FE000, 0x1FE3FF) AM_READWRITE( vdc_0_r, vdc_0_w )
 	AM_RANGE( 0x1FE400, 0x1FE7FF) AM_READWRITE( vce_r, vce_w )
-	AM_RANGE( 0x1FE800, 0x1FEBFF) AM_READWRITE( C6280_r, C6280_0_w )
+	AM_RANGE( 0x1FE800, 0x1FEBFF) AM_READWRITE( c6280_r, c6280_0_w )
 	AM_RANGE( 0x1FEC00, 0x1FEFFF) AM_READWRITE( H6280_timer_r, H6280_timer_w )
 	AM_RANGE( 0x1FF000, 0x1FF3FF) AM_READWRITE( pce_joystick_r, pce_joystick_w )
 	AM_RANGE( 0x1FF400, 0x1FF7FF) AM_READWRITE( H6280_irq_status_r, H6280_irq_status_w )
diff --git a/src/mame/drivers/ultraman.c b/src/mame/drivers/ultraman.c
index e6c799c929e..78755a2d9a3 100644
--- a/src/mame/drivers/ultraman.c
+++ b/src/mame/drivers/ultraman.c
@@ -138,8 +138,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xc000, 0xc000) AM_READ(soundlatch_r)	/* Sound latch read */
 //  AM_RANGE(0xd000, 0xd000) AM_WRITE(SMH_NOP)      /* ??? */
 	AM_RANGE(0xe000, 0xe000) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)		/* M6295 */
-	AM_RANGE(0xf000, 0xf000) AM_WRITE(YM2151_register_port_0_w)							/* YM2151 */
-	AM_RANGE(0xf001, 0xf001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)	/* YM2151 */
+	AM_RANGE(0xf000, 0xf000) AM_WRITE(ym2151_register_port_0_w)							/* YM2151 */
+	AM_RANGE(0xf001, 0xf001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)	/* YM2151 */
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
diff --git a/src/mame/drivers/unico.c b/src/mame/drivers/unico.c
index 9ede7461f62..9c7fd05fa02 100644
--- a/src/mame/drivers/unico.c
+++ b/src/mame/drivers/unico.c
@@ -37,9 +37,9 @@ Year + Game         PCB             Notes
 
 ***************************************************************************/
 
-static READ16_HANDLER ( YM3812_status_port_0_msb_r )	{	return YM3812_status_port_0_r(machine,0) << 8;	}
-static WRITE16_HANDLER( YM3812_register_port_0_msb_w )	{	if (ACCESSING_BITS_8_15)	YM3812_control_port_0_w(machine,0,data >> 8);	}
-static WRITE16_HANDLER( YM3812_data_port_0_msb_w )		{	if (ACCESSING_BITS_8_15)	YM3812_write_port_0_w(machine,0,data >> 8);		}
+static READ16_HANDLER ( YM3812_status_port_0_msb_r )	{	return ym3812_status_port_0_r(machine,0) << 8;	}
+static WRITE16_HANDLER( YM3812_register_port_0_msb_w )	{	if (ACCESSING_BITS_8_15)	ym3812_control_port_0_w(machine,0,data >> 8);	}
+static WRITE16_HANDLER( YM3812_data_port_0_msb_w )		{	if (ACCESSING_BITS_8_15)	ym3812_write_port_0_w(machine,0,data >> 8);		}
 
 
 /*
@@ -229,9 +229,9 @@ static READ32_HANDLER ( zeropnt2_oki1_r )			{ return okim6295_status_1_r(machine
 static WRITE32_HANDLER( zeropnt2_oki0_w )			{ if (ACCESSING_BITS_16_23)	okim6295_data_0_w(machine,0,(data >> 16) & 0xff); }
 static WRITE32_HANDLER( zeropnt2_oki1_w )			{ if (ACCESSING_BITS_16_23)	okim6295_data_1_w(machine,0,(data >> 16) & 0xff); }
 
-static READ32_HANDLER( zeropnt2_ym2151_status_r )	{ return YM2151_status_port_0_r(machine,0) << 16; }
-static WRITE32_HANDLER( zeropnt2_ym2151_reg_w )		{ if (ACCESSING_BITS_16_23)	YM2151_register_port_0_w(machine,0,(data >> 16) & 0xff); }
-static WRITE32_HANDLER( zeropnt2_ym2151_data_w )	{ if (ACCESSING_BITS_16_23)	YM2151_data_port_0_w(machine,0,(data >> 16) & 0xff); }
+static READ32_HANDLER( zeropnt2_ym2151_status_r )	{ return ym2151_status_port_0_r(machine,0) << 16; }
+static WRITE32_HANDLER( zeropnt2_ym2151_reg_w )		{ if (ACCESSING_BITS_16_23)	ym2151_register_port_0_w(machine,0,(data >> 16) & 0xff); }
+static WRITE32_HANDLER( zeropnt2_ym2151_data_w )	{ if (ACCESSING_BITS_16_23)	ym2151_data_port_0_w(machine,0,(data >> 16) & 0xff); }
 
 static WRITE32_HANDLER( zeropnt2_sound_bank_w )
 {
diff --git a/src/mame/drivers/usgames.c b/src/mame/drivers/usgames.c
index 50f80993a45..e2197357703 100644
--- a/src/mame/drivers/usgames.c
+++ b/src/mame/drivers/usgames.c
@@ -79,8 +79,8 @@ static ADDRESS_MAP_START( usgames_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x2041, 0x2041) AM_DEVWRITE(MC6845, "crtc", mc6845_register_w)
 	AM_RANGE(0x2060, 0x2060) AM_WRITE(usgames_rombank_w)
 	AM_RANGE(0x2070, 0x2070) AM_READ(input_port_3_r)
-	AM_RANGE(0x2400, 0x2400) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2401, 0x2401) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x2400, 0x2400) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2401, 0x2401) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x2800, 0x2fff) AM_RAM_WRITE(usgames_charram_w) AM_BASE(&usgames_charram)
 	AM_RANGE(0x3000, 0x3fff) AM_RAM_WRITE(usgames_videoram_w) AM_BASE(&usgames_videoram)
 	AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK1, SMH_ROM)
@@ -90,8 +90,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( usg185_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_RAM AM_BASE(&generic_nvram) AM_SIZE(&generic_nvram_size)
-	AM_RANGE(0x2000, 0x2000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x2001, 0x2001) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x2000, 0x2000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x2001, 0x2001) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x2400, 0x2400) AM_READ(input_port_1_r)
 	AM_RANGE(0x2410, 0x2410) AM_READ(input_port_0_r)
 	AM_RANGE(0x2420, 0x2420) AM_WRITE(lamps1_w)
diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c
index c17b914b7db..17186dc1ed9 100644
--- a/src/mame/drivers/vamphalf.c
+++ b/src/mame/drivers/vamphalf.c
@@ -71,7 +71,7 @@ static WRITE32_HANDLER( oki32_w )
 static READ16_HANDLER( ym2151_status_r )
 {
 	if(offset)
-		return YM2151_status_port_0_r(machine, 0);
+		return ym2151_status_port_0_r(machine, 0);
 	else
 		return 0;
 }
@@ -79,28 +79,28 @@ static READ16_HANDLER( ym2151_status_r )
 static WRITE16_HANDLER( ym2151_data_w )
 {
 	if(offset)
-		YM2151_data_port_0_w(machine, 0, data);
+		ym2151_data_port_0_w(machine, 0, data);
 }
 
 static WRITE16_HANDLER( ym2151_register_w )
 {
 	if(offset)
-		YM2151_register_port_0_w(machine, 0, data);
+		ym2151_register_port_0_w(machine, 0, data);
 }
 
 static READ32_HANDLER( ym2151_status32_r )
 {
-	return YM2151_status_port_0_r(machine, 0) << 8;
+	return ym2151_status_port_0_r(machine, 0) << 8;
 }
 
 static WRITE32_HANDLER( ym2151_data32_w )
 {
-	YM2151_data_port_0_w(machine, 0, (data >> 8) & 0xff);
+	ym2151_data_port_0_w(machine, 0, (data >> 8) & 0xff);
 }
 
 static WRITE32_HANDLER( ym2151_register32_w )
 {
-	YM2151_register_port_0_w(machine, 0, (data >> 8) & 0xff);
+	ym2151_register_port_0_w(machine, 0, (data >> 8) & 0xff);
 }
 
 static READ16_HANDLER( eeprom_r )
diff --git a/src/mame/drivers/vaportra.c b/src/mame/drivers/vaportra.c
index 4df7f2cbae7..37c96c39ea9 100644
--- a/src/mame/drivers/vaportra.c
+++ b/src/mame/drivers/vaportra.c
@@ -82,10 +82,10 @@ static WRITE8_HANDLER( YM2151_w )
 {
 	switch (offset) {
 	case 0:
-		YM2151_register_port_0_w(machine,0,data);
+		ym2151_register_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2151_data_port_0_w(machine,0,data);
+		ym2151_data_port_0_w(machine,0,data);
 		break;
 	}
 }
@@ -94,18 +94,18 @@ static WRITE8_HANDLER( YM2203_w )
 {
 	switch (offset) {
 	case 0:
-		YM2203_control_port_0_w(machine,0,data);
+		ym2203_control_port_0_w(machine,0,data);
 		break;
 	case 1:
-		YM2203_write_port_0_w(machine,0,data);
+		ym2203_write_port_0_w(machine,0,data);
 		break;
 	}
 }
 
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x000000, 0x00ffff) AM_ROM
-	AM_RANGE(0x100000, 0x100001) AM_READWRITE(YM2203_status_port_0_r, YM2203_w)
-	AM_RANGE(0x110000, 0x110001) AM_READWRITE(YM2151_status_port_0_r, YM2151_w)
+	AM_RANGE(0x100000, 0x100001) AM_READWRITE(ym2203_status_port_0_r, YM2203_w)
+	AM_RANGE(0x110000, 0x110001) AM_READWRITE(ym2151_status_port_0_r, YM2151_w)
 	AM_RANGE(0x120000, 0x120001) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w)
 	AM_RANGE(0x130000, 0x130001) AM_READWRITE(okim6295_status_1_r, okim6295_data_1_w)
 	AM_RANGE(0x140000, 0x140001) AM_READ(vaportra_soundlatch_r)
diff --git a/src/mame/drivers/vastar.c b/src/mame/drivers/vastar.c
index 4918638b632..607670e4293 100644
--- a/src/mame/drivers/vastar.c
+++ b/src/mame/drivers/vastar.c
@@ -152,9 +152,9 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cpu2_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_READ(AY8910_read_port_0_r)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READ(ay8910_read_port_0_r)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/vball.c b/src/mame/drivers/vball.c
index a4e42559fdc..30be15d77d9 100644
--- a/src/mame/drivers/vball.c
+++ b/src/mame/drivers/vball.c
@@ -217,7 +217,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_readmem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_READ(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_READ(SMH_RAM)
-	AM_RANGE(0x8801, 0x8801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0x8801, 0x8801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0x9800, 0x9800) AM_READ(okim6295_status_0_r)
 	AM_RANGE(0xA000, 0xA000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
@@ -225,8 +225,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_writemem, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0x8000, 0x87ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9803) AM_WRITE(okim6295_data_0_w)
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/vendetta.c b/src/mame/drivers/vendetta.c
index 5ccdc01fe43..59632273dca 100644
--- a/src/mame/drivers/vendetta.c
+++ b/src/mame/drivers/vendetta.c
@@ -342,15 +342,15 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( readmem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_READ(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_READ(SMH_RAM)
-	AM_RANGE(0xf801, 0xf801) AM_READ(YM2151_status_port_0_r)
+	AM_RANGE(0xf801, 0xf801) AM_READ(ym2151_status_port_0_r)
 	AM_RANGE(0xfc00, 0xfc2f) AM_READ(k053260_0_r)
 ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( writemem_sound, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xefff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xf000, 0xf7ff) AM_WRITE(SMH_RAM)
-	AM_RANGE(0xf800, 0xf800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2151_data_port_0_w)
+	AM_RANGE(0xf800, 0xf800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ym2151_data_port_0_w)
 	AM_RANGE(0xfa00, 0xfa00) AM_WRITE(z80_arm_nmi_w)
 	AM_RANGE(0xfc00, 0xfc2f) AM_WRITE(k053260_0_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/vigilant.c b/src/mame/drivers/vigilant.c
index 6fbf45732ec..550878c28e6 100644
--- a/src/mame/drivers/vigilant.c
+++ b/src/mame/drivers/vigilant.c
@@ -119,8 +119,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0x80, 0x81) AM_READWRITE(soundlatch_r, vigilant_sample_addr_w)	/* STL / STH */
 	AM_RANGE(0x82, 0x82) AM_WRITE(m72_sample_w)			/* COUNT UP */
 	AM_RANGE(0x83, 0x83) AM_WRITE(m72_sound_irq_ack_w)	/* IRQ clear */
@@ -129,10 +129,10 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( buccanrs_sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0x02, 0x02) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x03, 0x03) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0x02, 0x02) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x03, 0x03) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0x80, 0x80) AM_READ(soundlatch_r)				/* SDRE */
 	AM_RANGE(0x80, 0x81) AM_WRITE(vigilant_sample_addr_w)	/* STL / STH */
 	AM_RANGE(0x82, 0x82) AM_WRITE(m72_sample_w)				/* COUNT UP */
diff --git a/src/mame/drivers/vmetal.c b/src/mame/drivers/vmetal.c
index 301202bdb55..1591c497162 100644
--- a/src/mame/drivers/vmetal.c
+++ b/src/mame/drivers/vmetal.c
@@ -164,12 +164,12 @@ static WRITE16_HANDLER( vmetal_control_w )
 	if ((data & 0x40) == 0)
 		sndti_reset(SOUND_ES8712, 0);
 	else
-		ES8712_play(0);
+		es8712_play(0);
 
 	if (data & 0x10)
-		ES8712_set_bank_base(0, 0x100000);
+		es8712_set_bank_base(0, 0x100000);
 	else
-		ES8712_set_bank_base(0, 0x000000);
+		es8712_set_bank_base(0, 0x000000);
 
 	if (data & 0xa0)
 		logerror("PC:%06x - Writing unknown bits %04x to $200000\n",activecpu_get_previouspc(),data);
@@ -207,7 +207,7 @@ static WRITE16_HANDLER( vmetal_es8712_w )
     16   002a 000e 0083 00ee 000f 0069 0069   0e832a-0f69ee
     */
 
-	ES8712_data_0_lsb_w(machine, offset, data, mem_mask);
+	es8712_data_0_lsb_w(machine, offset, data, mem_mask);
 	logerror("PC:%06x - Writing %04x to ES8712 offset %02x\n",activecpu_get_previouspc(),data,offset);
 }
 
diff --git a/src/mame/drivers/volfied.c b/src/mame/drivers/volfied.c
index 341b8e587a2..817c415ecf7 100644
--- a/src/mame/drivers/volfied.c
+++ b/src/mame/drivers/volfied.c
@@ -83,8 +83,8 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x8800, 0x8800) AM_WRITE(taitosound_slave_port_w)
 	AM_RANGE(0x8801, 0x8801) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
-	AM_RANGE(0x9000, 0x9000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x9001, 0x9001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0x9000, 0x9000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x9001, 0x9001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_WRITE(SMH_NOP)    /* ? */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/vroulet.c b/src/mame/drivers/vroulet.c
index d085b1b1cfb..14b94d9e4b9 100644
--- a/src/mame/drivers/vroulet.c
+++ b/src/mame/drivers/vroulet.c
@@ -113,8 +113,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( vroulet_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_control_port_0_w)
 	AM_RANGE(0x10, 0x13) AM_DEVREADWRITE(PPI8255, "ppi8255_0", ppi8255_r, ppi8255_w)
 	AM_RANGE(0x80, 0x83) AM_DEVREADWRITE(PPI8255, "ppi8255_1", ppi8255_r, ppi8255_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c
index 84c1dedc768..b75bc01d3cb 100644
--- a/src/mame/drivers/vsnes.c
+++ b/src/mame/drivers/vsnes.c
@@ -221,7 +221,7 @@ static WRITE8_HANDLER( psg1_4017_w )
 static ADDRESS_MAP_START( vsnes_cpu1_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&work_ram)
 	AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_0_r, ppu2c0x_0_w)
-	AM_RANGE(0x4011, 0x4011) AM_WRITE(DAC_0_data_w)
+	AM_RANGE(0x4011, 0x4011) AM_WRITE(dac_0_data_w)
 	AM_RANGE(0x4000, 0x4013) AM_READWRITE(nes_psg_0_r, nes_psg_0_w)
 	AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_0_w)
 	AM_RANGE(0x4015, 0x4015) AM_READWRITE(psg_4015_r, psg_4015_w)  /* PSG status / first control register */
@@ -234,7 +234,7 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( vsnes_cpu2_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_MIRROR(0x1800) AM_RAM AM_BASE(&work_ram_1)
 	AM_RANGE(0x2000, 0x3fff) AM_READWRITE(ppu2c0x_1_r, ppu2c0x_1_w)
-	AM_RANGE(0x4011, 0x4011) AM_WRITE(DAC_1_data_w)
+	AM_RANGE(0x4011, 0x4011) AM_WRITE(dac_1_data_w)
 	AM_RANGE(0x4000, 0x4013) AM_READWRITE(nes_psg_1_r, nes_psg_1_w)
 	AM_RANGE(0x4014, 0x4014) AM_WRITE(sprite_dma_1_w)
 	AM_RANGE(0x4015, 0x4015) AM_READWRITE(psg1_4015_r, psg1_4015_w)	/* PSG status / first control register */
diff --git a/src/mame/drivers/vulgus.c b/src/mame/drivers/vulgus.c
index 702027774d9..5446621a218 100644
--- a/src/mame/drivers/vulgus.c
+++ b/src/mame/drivers/vulgus.c
@@ -90,10 +90,10 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x47ff) AM_RAM
 	AM_RANGE(0x4000, 0x47ff) AM_WRITE(SMH_RAM)
 	AM_RANGE(0x6000, 0x6000) AM_READ(soundlatch_r)
-	AM_RANGE(0x8000, 0x8000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(AY8910_control_port_1_w)
-	AM_RANGE(0xc001, 0xc001) AM_WRITE(AY8910_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ay8910_control_port_1_w)
+	AM_RANGE(0xc001, 0xc001) AM_WRITE(ay8910_write_port_1_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/wallc.c b/src/mame/drivers/wallc.c
index 055bb665014..ee0ec5f68b7 100644
--- a/src/mame/drivers/wallc.c
+++ b/src/mame/drivers/wallc.c
@@ -154,8 +154,8 @@ static ADDRESS_MAP_START( wallc_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0xb000, 0xb000) AM_WRITENOP
 	AM_RANGE(0xb100, 0xb100) AM_WRITE(wallc_coin_counter_w)
 	AM_RANGE(0xb200, 0xb200) AM_WRITENOP
-	AM_RANGE(0xb500, 0xb500) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0xb600, 0xb600) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0xb500, 0xb500) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0xb600, 0xb600) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/wardner.c b/src/mame/drivers/wardner.c
index 67adf9a05e7..cf202955f60 100644
--- a/src/mame/drivers/wardner.c
+++ b/src/mame/drivers/wardner.c
@@ -230,8 +230,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(YM3812_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ym3812_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/drivers/warriorb.c b/src/mame/drivers/warriorb.c
index c624fef3dd0..7710ef2e735 100644
--- a/src/mame/drivers/warriorb.c
+++ b/src/mame/drivers/warriorb.c
@@ -248,10 +248,10 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_READWRITE(SMH_BANK10, SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2610_read_port_0_r, ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(warriorb_pancontrol) /* pan */
diff --git a/src/mame/drivers/wc90.c b/src/mame/drivers/wc90.c
index a2cde993e50..d63dae37bc5 100644
--- a/src/mame/drivers/wc90.c
+++ b/src/mame/drivers/wc90.c
@@ -162,10 +162,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
-	AM_RANGE(0xf800, 0xf800) AM_READWRITE(YM2608_status_port_0_A_r, YM2608_control_port_0_A_w)
-	AM_RANGE(0xf801, 0xf801) AM_WRITE(YM2608_data_port_0_A_w)
-	AM_RANGE(0xf802, 0xf802) AM_READWRITE(YM2608_status_port_0_B_r, YM2608_control_port_0_B_w)
-	AM_RANGE(0xf803, 0xf803) AM_WRITE(YM2608_data_port_0_B_w)
+	AM_RANGE(0xf800, 0xf800) AM_READWRITE(ym2608_status_port_0_a_r, ym2608_control_port_0_a_w)
+	AM_RANGE(0xf801, 0xf801) AM_WRITE(ym2608_data_port_0_a_w)
+	AM_RANGE(0xf802, 0xf802) AM_READWRITE(ym2608_status_port_0_b_r, ym2608_control_port_0_b_w)
+	AM_RANGE(0xf803, 0xf803) AM_WRITE(ym2608_data_port_0_b_w)
 	AM_RANGE(0xfc00, 0xfc00) AM_READ(SMH_NOP) /* ??? adpcm ??? */
 	AM_RANGE(0xfc10, 0xfc10) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/wc90b.c b/src/mame/drivers/wc90b.c
index 3e3a2bcb9c3..c80212be415 100644
--- a/src/mame/drivers/wc90b.c
+++ b/src/mame/drivers/wc90b.c
@@ -199,8 +199,8 @@ static ADDRESS_MAP_START( sound_cpu, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(3)
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(adpcm_control_w)
 	AM_RANGE(0xe400, 0xe400) AM_WRITE(adpcm_data_w)
-	AM_RANGE(0xe800, 0xe800) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0xe801, 0xe801) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0xe801, 0xe801) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index a5b18bcb950..c987b0c49e7 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -697,8 +697,8 @@ static ADDRESS_MAP_START( wecleman_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x9006, 0x9006) AM_WRITE(SMH_NOP)	// ?
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)	// From main CPU
 	AM_RANGE(0xb000, 0xb00d) AM_READWRITE(k007232_read_port_0_r, k007232_write_port_0_w)	// K007232 (Reading offset 5/b triggers the sample)
-	AM_RANGE(0xc000, 0xc000) AM_WRITE(YM2151_register_port_0_w)	// YM2151
-	AM_RANGE(0xc001, 0xc001) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc000, 0xc000) AM_WRITE(ym2151_register_port_0_w)	// YM2151
+	AM_RANGE(0xc001, 0xc001) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(wecleman_K00723216_bank_w)	// Samples banking
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/welltris.c b/src/mame/drivers/welltris.c
index 375515414f6..fc464ccb46a 100644
--- a/src/mame/drivers/welltris.c
+++ b/src/mame/drivers/welltris.c
@@ -395,10 +395,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
 	AM_RANGE(0x00, 0x00) AM_WRITE(welltris_sh_bankswitch_w)
-	AM_RANGE(0x08, 0x08) AM_READWRITE(YM2610_status_port_0_A_r,YM2610_control_port_0_A_w)
-	AM_RANGE(0x09, 0x09) AM_WRITE(YM2610_data_port_0_A_w)
-	AM_RANGE(0x0a, 0x0a) AM_READWRITE(YM2610_status_port_0_B_r,YM2610_control_port_0_B_w)
-	AM_RANGE(0x0b, 0x0b) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0x08, 0x08) AM_READWRITE(ym2610_status_port_0_a_r,ym2610_control_port_0_a_w)
+	AM_RANGE(0x09, 0x09) AM_WRITE(ym2610_data_port_0_a_w)
+	AM_RANGE(0x0a, 0x0a) AM_READWRITE(ym2610_status_port_0_b_r,ym2610_control_port_0_b_w)
+	AM_RANGE(0x0b, 0x0b) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0x10, 0x10) AM_READ(soundlatch_r)
 	AM_RANGE(0x18, 0x18) AM_WRITE(pending_command_clear_w)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/wgp.c b/src/mame/drivers/wgp.c
index 3382fdc7853..b1a1ce05f1d 100644
--- a/src/mame/drivers/wgp.c
+++ b/src/mame/drivers/wgp.c
@@ -690,10 +690,10 @@ static ADDRESS_MAP_START( z80_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)	/* Fallthrough */
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2610_status_port_0_A_r,YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r,YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r,YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2610_status_port_0_a_r,ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2610_read_port_0_r,ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2610_status_port_0_b_r,ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP,taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r,taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c
index 394c1029cf6..223d159f920 100644
--- a/src/mame/drivers/wink.c
+++ b/src/mame/drivers/wink.c
@@ -132,8 +132,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( wink_sound_io, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_READWRITE(AY8910_read_port_0_r, AY8910_write_port_0_w)
-	AM_RANGE(0x80, 0x80) AM_WRITE(AY8910_control_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_READWRITE(ay8910_read_port_0_r, ay8910_write_port_0_w)
+	AM_RANGE(0x80, 0x80) AM_WRITE(ay8910_control_port_0_w)
 ADDRESS_MAP_END
 
 static INPUT_PORTS_START( wink )
diff --git a/src/mame/drivers/witch.c b/src/mame/drivers/witch.c
index e3ccb4872f1..6a1d2f2c4f0 100644
--- a/src/mame/drivers/witch.c
+++ b/src/mame/drivers/witch.c
@@ -442,10 +442,10 @@ static const ym2203_interface ym2203_interface_1 =
 static ADDRESS_MAP_START( map_main, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, UNBANKED_SIZE-1) AM_ROM
 	AM_RANGE(UNBANKED_SIZE, 0x7fff) AM_READ(SMH_BANK1)
-	AM_RANGE(0x8000, 0x8000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0x8008, 0x8008) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x8009, 0x8009) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0x8008, 0x8008) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x8009, 0x8009) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0xa000, 0xa00f) AM_READWRITE(read_a00x, write_a00x)
 	AM_RANGE(0xc000, 0xc3ff) AM_READWRITE(gfx0_vram_r, gfx0_vram_w) AM_BASE(&gfx0_vram)
 	AM_RANGE(0xc400, 0xc7ff) AM_READWRITE(gfx0_cram_r, gfx0_cram_w) AM_BASE(&gfx0_cram)
@@ -462,11 +462,11 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( map_sub, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
-	AM_RANGE(0x8000, 0x8000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0x8008, 0x8008) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x8009, 0x8009) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
-	AM_RANGE(0x8010, 0x8016) AM_READWRITE(read_8010, ES8712_data_0_w)
+	AM_RANGE(0x8000, 0x8000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0x8008, 0x8008) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x8009, 0x8009) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
+	AM_RANGE(0x8010, 0x8016) AM_READWRITE(read_8010, es8712_data_0_w)
 	AM_RANGE(0xa000, 0xa00f) AM_READWRITE(read_a00x, write_a00x)
 	AM_RANGE(0xf000, 0xf0ff) AM_RAM AM_SHARE(1)
 	AM_RANGE(0xf180, 0xffff) AM_RAM AM_SHARE(2)
diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c
index b9ec756d784..b23e281a7e9 100644
--- a/src/mame/drivers/wiz.c
+++ b/src/mame/drivers/wiz.c
@@ -260,12 +260,12 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x1fff) AM_ROM
 	AM_RANGE(0x2000, 0x23ff) AM_RAM
 	AM_RANGE(0x3000, 0x3000) AM_READWRITE(soundlatch_r,interrupt_enable_w)	/* Stinger/Scion */
-	AM_RANGE(0x4000, 0x4000) AM_WRITE(AY8910_control_port_2_w)
-	AM_RANGE(0x4001, 0x4001) AM_WRITE(AY8910_write_port_2_w)
-	AM_RANGE(0x5000, 0x5000) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x5001, 0x5001) AM_WRITE(AY8910_write_port_0_w)
-	AM_RANGE(0x6000, 0x6000) AM_WRITE(AY8910_control_port_1_w)				/* Wiz only */
-	AM_RANGE(0x6001, 0x6001) AM_WRITE(AY8910_write_port_1_w)				/* Wiz only */
+	AM_RANGE(0x4000, 0x4000) AM_WRITE(ay8910_control_port_2_w)
+	AM_RANGE(0x4001, 0x4001) AM_WRITE(ay8910_write_port_2_w)
+	AM_RANGE(0x5000, 0x5000) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x5001, 0x5001) AM_WRITE(ay8910_write_port_0_w)
+	AM_RANGE(0x6000, 0x6000) AM_WRITE(ay8910_control_port_1_w)				/* Wiz only */
+	AM_RANGE(0x6001, 0x6001) AM_WRITE(ay8910_write_port_1_w)				/* Wiz only */
 	AM_RANGE(0x7000, 0x7000) AM_READWRITE(soundlatch_r,interrupt_enable_w)	/* Wiz */
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/wldarrow.c b/src/mame/drivers/wldarrow.c
index 7722e77775d..332088f9018 100644
--- a/src/mame/drivers/wldarrow.c
+++ b/src/mame/drivers/wldarrow.c
@@ -129,25 +129,25 @@ static WRITE8_HANDLER( counter_w )
 
 static WRITE8_HANDLER( wldarrow_dac_1_w )
 {
-	DAC_data_w(0, 0x00);
+	dac_data_w(0, 0x00);
 }
 
 
 static WRITE8_HANDLER( wldarrow_dac_2_w )
 {
-	DAC_data_w(0, 0x55);
+	dac_data_w(0, 0x55);
 }
 
 
 static WRITE8_HANDLER( wldarrow_dac_3_w )
 {
-	DAC_data_w(0, 0xaa);
+	dac_data_w(0, 0xaa);
 }
 
 
 static WRITE8_HANDLER( wldarrow_dac_4_w )
 {
-	DAC_data_w(0, 0xff);
+	dac_data_w(0, 0xff);
 }
 
 
diff --git a/src/mame/drivers/wwfsstar.c b/src/mame/drivers/wwfsstar.c
index 89c191020ac..ac172adc31d 100644
--- a/src/mame/drivers/wwfsstar.c
+++ b/src/mame/drivers/wwfsstar.c
@@ -187,8 +187,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
-	AM_RANGE(0x8800, 0x8800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0x8801, 0x8801) AM_READWRITE(YM2151_status_port_0_r,YM2151_data_port_0_w)
+	AM_RANGE(0x8800, 0x8800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0x8801, 0x8801) AM_READWRITE(ym2151_status_port_0_r,ym2151_data_port_0_w)
 	AM_RANGE(0x9800, 0x9800) AM_READWRITE(okim6295_status_0_r,okim6295_data_0_w)
 	AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_r)
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/wwfwfest.c b/src/mame/drivers/wwfwfest.c
index 8707cf99bcc..6bedc6dba58 100644
--- a/src/mame/drivers/wwfwfest.c
+++ b/src/mame/drivers/wwfwfest.c
@@ -87,8 +87,8 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xc7ff) AM_RAM
-	AM_RANGE(0xc800, 0xc800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xc801, 0xc801) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xc800, 0xc800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xc801, 0xc801) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xd800, 0xd800) AM_READWRITE(okim6295_status_0_r,okim6295_data_0_w)
 	AM_RANGE(0xe000, 0xe000) AM_READ(soundlatch_r)
 	AM_RANGE(0xe800, 0xe800) AM_WRITE(oki_bankswitch_w)
diff --git a/src/mame/drivers/xain.c b/src/mame/drivers/xain.c
index afa31252a94..fd7eb97a97d 100644
--- a/src/mame/drivers/xain.c
+++ b/src/mame/drivers/xain.c
@@ -315,10 +315,10 @@ ADDRESS_MAP_END
 static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x07ff) AM_RAM
 	AM_RANGE(0x1000, 0x1000) AM_READ(soundlatch_r)
-	AM_RANGE(0x2800, 0x2800) AM_WRITE(YM2203_control_port_0_w)
-	AM_RANGE(0x2801, 0x2801) AM_WRITE(YM2203_write_port_0_w)
-	AM_RANGE(0x3000, 0x3000) AM_WRITE(YM2203_control_port_1_w)
-	AM_RANGE(0x3001, 0x3001) AM_WRITE(YM2203_write_port_1_w)
+	AM_RANGE(0x2800, 0x2800) AM_WRITE(ym2203_control_port_0_w)
+	AM_RANGE(0x2801, 0x2801) AM_WRITE(ym2203_write_port_0_w)
+	AM_RANGE(0x3000, 0x3000) AM_WRITE(ym2203_control_port_1_w)
+	AM_RANGE(0x3001, 0x3001) AM_WRITE(ym2203_write_port_1_w)
 	AM_RANGE(0x4000, 0xffff) AM_ROM
 ADDRESS_MAP_END
 
diff --git a/src/mame/drivers/xexex.c b/src/mame/drivers/xexex.c
index 28cdb333a1b..74ab2efa05d 100644
--- a/src/mame/drivers/xexex.c
+++ b/src/mame/drivers/xexex.c
@@ -396,8 +396,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0xbfff) AM_ROM
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
 	AM_RANGE(0xe000, 0xe22f) AM_READWRITE(k054539_0_r, k054539_0_w)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xec01, 0xec01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xec01, 0xec01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch3_w)
 	AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r)
 	AM_RANGE(0xf003, 0xf003) AM_READ(soundlatch2_r)
diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c
index bde3c75197b..573a5cd7ad6 100644
--- a/src/mame/drivers/xmen.c
+++ b/src/mame/drivers/xmen.c
@@ -197,8 +197,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xbfff) AM_WRITE(SMH_ROM)
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
 	AM_RANGE(0xe000, 0xe22f) AM_READWRITE(k054539_0_r, k054539_0_w)
-	AM_RANGE(0xe800, 0xe800) AM_WRITE(YM2151_register_port_0_w)
-	AM_RANGE(0xec01, 0xec01) AM_READWRITE(YM2151_status_port_0_r, YM2151_data_port_0_w)
+	AM_RANGE(0xe800, 0xe800) AM_WRITE(ym2151_register_port_0_w)
+	AM_RANGE(0xec01, 0xec01) AM_READWRITE(ym2151_status_port_0_r, ym2151_data_port_0_w)
 	AM_RANGE(0xf000, 0xf000) AM_WRITE(soundlatch2_w)
 	AM_RANGE(0xf002, 0xf002) AM_READ(soundlatch_r)
 	AM_RANGE(0xf800, 0xf800) AM_WRITE(sound_bankswitch_w)
diff --git a/src/mame/drivers/xtheball.c b/src/mame/drivers/xtheball.c
index aa1d895350f..4d3ffcc81eb 100644
--- a/src/mame/drivers/xtheball.c
+++ b/src/mame/drivers/xtheball.c
@@ -126,7 +126,7 @@ static void xtheball_from_shiftreg(UINT32 address, UINT16 *shiftreg)
 static WRITE16_HANDLER( dac_w )
 {
 	if (ACCESSING_BITS_8_15)
-		DAC_data_w(0, data >> 8);
+		dac_data_w(0, data >> 8);
 }
 
 
diff --git a/src/mame/drivers/xxmissio.c b/src/mame/drivers/xxmissio.c
index 945a3949556..fbf4b990b91 100644
--- a/src/mame/drivers/xxmissio.c
+++ b/src/mame/drivers/xxmissio.c
@@ -103,10 +103,10 @@ static MACHINE_START( xxmissio )
 static ADDRESS_MAP_START( map1, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 
-	AM_RANGE(0x8000, 0x8000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 
 	AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
 	AM_RANGE(0xa001, 0xa001) AM_READ(input_port_1_r)
@@ -129,10 +129,10 @@ static ADDRESS_MAP_START( map2, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x0000, 0x3fff) AM_ROM
 	AM_RANGE(0x4000, 0x7fff) AM_ROMBANK(1)
 
-	AM_RANGE(0x8000, 0x8000) AM_READWRITE(YM2203_status_port_0_r, YM2203_control_port_0_w)
-	AM_RANGE(0x8001, 0x8001) AM_READWRITE(YM2203_read_port_0_r, YM2203_write_port_0_w)
-	AM_RANGE(0x8002, 0x8002) AM_READWRITE(YM2203_status_port_1_r, YM2203_control_port_1_w)
-	AM_RANGE(0x8003, 0x8003) AM_READWRITE(YM2203_read_port_1_r, YM2203_write_port_1_w)
+	AM_RANGE(0x8000, 0x8000) AM_READWRITE(ym2203_status_port_0_r, ym2203_control_port_0_w)
+	AM_RANGE(0x8001, 0x8001) AM_READWRITE(ym2203_read_port_0_r, ym2203_write_port_0_w)
+	AM_RANGE(0x8002, 0x8002) AM_READWRITE(ym2203_status_port_1_r, ym2203_control_port_1_w)
+	AM_RANGE(0x8003, 0x8003) AM_READWRITE(ym2203_read_port_1_r, ym2203_write_port_1_w)
 	AM_RANGE(0x8006, 0x8006) AM_WRITE(xxmissio_bank_sel_w)
 
 	AM_RANGE(0xa000, 0xa000) AM_READ(input_port_0_r)
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index 0edf0aa7a02..a9cdf55ccdf 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -68,15 +68,15 @@ extern WRITE8_HANDLER( konami_SN76496_0_w );
 
 static READ8_HANDLER( yiear_speech_r )
 {
-	if (VLM5030_BSY()) return 1;
+	if (vlm5030_bsy()) return 1;
 	else return 0;
 }
 
 static WRITE8_HANDLER( yiear_VLM5030_control_w )
 {
 	/* bit 0 is latch direction */
-	VLM5030_ST( ( data >> 1 ) & 1 );
-	VLM5030_RST( ( data >> 2 ) & 1 );
+	vlm5030_st( ( data >> 1 ) & 1 );
+	vlm5030_rst( ( data >> 2 ) & 1 );
 }
 
 static INTERRUPT_GEN( yiear_nmi_interrupt )
@@ -92,7 +92,7 @@ static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4800, 0x4800) AM_WRITE(konami_SN76496_latch_w)
 	AM_RANGE(0x4900, 0x4900) AM_WRITE(konami_SN76496_0_w)
 	AM_RANGE(0x4a00, 0x4a00) AM_WRITE(yiear_VLM5030_control_w)
-	AM_RANGE(0x4b00, 0x4b00) AM_WRITE(VLM5030_data_w)
+	AM_RANGE(0x4b00, 0x4b00) AM_WRITE(vlm5030_data_w)
 	AM_RANGE(0x4c00, 0x4c00) AM_READ(input_port_3_r)
 	AM_RANGE(0x4d00, 0x4d00) AM_READ(input_port_4_r)
 	AM_RANGE(0x4e00, 0x4e00) AM_READ(input_port_0_r)
diff --git a/src/mame/drivers/yumefuda.c b/src/mame/drivers/yumefuda.c
index f05331ba8d8..bc825657201 100644
--- a/src/mame/drivers/yumefuda.c
+++ b/src/mame/drivers/yumefuda.c
@@ -212,8 +212,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x40, 0x40) AM_READWRITE(AY8910_read_port_0_r, AY8910_control_port_0_w)
-	AM_RANGE(0x41, 0x41) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x40, 0x40) AM_READWRITE(ay8910_read_port_0_r, ay8910_control_port_0_w)
+	AM_RANGE(0x41, 0x41) AM_WRITE(ay8910_write_port_0_w)
 	AM_RANGE(0x80, 0x80) AM_WRITE(mux_w)
 	AM_RANGE(0x81, 0x81) AM_READ(eeprom_r)
 	AM_RANGE(0x82, 0x82) AM_READ(mux_r)
diff --git a/src/mame/drivers/yunsun16.c b/src/mame/drivers/yunsun16.c
index 29620a49b69..c93594de97f 100644
--- a/src/mame/drivers/yunsun16.c
+++ b/src/mame/drivers/yunsun16.c
@@ -185,8 +185,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( sound_port_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x10, 0x10) AM_READWRITE(YM3812_status_port_0_r, YM3812_control_port_0_w )	// YM3812
-	AM_RANGE(0x11, 0x11) AM_WRITE(YM3812_write_port_0_w )
+	AM_RANGE(0x10, 0x10) AM_READWRITE(ym3812_status_port_0_r, ym3812_control_port_0_w )	// YM3812
+	AM_RANGE(0x11, 0x11) AM_WRITE(ym3812_write_port_0_w )
 	AM_RANGE(0x18, 0x18) AM_READ(soundlatch_r )						// From Main CPU
 	AM_RANGE(0x1c, 0x1c) AM_READWRITE(okim6295_status_0_r, okim6295_data_0_w )		// M6295
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c
index 3eb7b7763e7..998a97ab0af 100644
--- a/src/mame/drivers/yunsung8.c
+++ b/src/mame/drivers/yunsung8.c
@@ -157,8 +157,8 @@ static ADDRESS_MAP_START( sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x8000, 0xbfff) AM_READWRITE(SMH_BANK2,SMH_ROM		)	// Banked ROM
 	AM_RANGE(0xe000, 0xe000) AM_WRITE(yunsung8_sound_bankswitch_w	)	// ROM Bank
 	AM_RANGE(0xe400, 0xe400) AM_WRITE(yunsung8_adpcm_w				)
-	AM_RANGE(0xec00, 0xec00) AM_WRITE(YM3812_control_port_0_w		)	// YM3812
-	AM_RANGE(0xec01, 0xec01) AM_WRITE(YM3812_write_port_0_w			)
+	AM_RANGE(0xec00, 0xec00) AM_WRITE(ym3812_control_port_0_w		)	// YM3812
+	AM_RANGE(0xec01, 0xec01) AM_WRITE(ym3812_write_port_0_w			)
 	AM_RANGE(0xf000, 0xf7ff) AM_RAM
 	AM_RANGE(0xf800, 0xf800) AM_READ(soundlatch_r					)	// From Main CPU
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c
index 4943601247b..c0d3a3b8cb4 100644
--- a/src/mame/drivers/zaccaria.c
+++ b/src/mame/drivers/zaccaria.c
@@ -94,10 +94,10 @@ static WRITE8_HANDLER( ay8910_port0a_w )
 	{
 		/* TODO: is this right? it sound awful */
 		static const int table[4] = { 0x05, 0x1b, 0x0b, 0x55 };
-		DAC_signed_data_w(0,table[(data & 0x06) >> 1]);
+		dac_signed_data_w(0,table[(data & 0x06) >> 1]);
 	}
 	else
-		DAC_signed_data_w(0,0x80);
+		dac_signed_data_w(0,0x80);
 }
 
 
@@ -109,9 +109,9 @@ static int active_8910,port0a,acs;
 static READ8_HANDLER( zaccaria_port0a_r )
 {
 	if (active_8910 == 0)
-		return AY8910_read_port_0_r(machine,0);
+		return ay8910_read_port_0_r(machine,0);
 	else
-		return AY8910_read_port_1_r(machine,0);
+		return ay8910_read_port_1_r(machine,0);
 }
 
 static WRITE8_HANDLER( zaccaria_port0a_w )
@@ -129,9 +129,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
 	{
 		/* bit 0 goes to the 8910 #0 BC1 pin */
 		if (last & 0x01)
-			AY8910_control_port_0_w(machine,0,port0a);
+			ay8910_control_port_0_w(machine,0,port0a);
 		else
-			AY8910_write_port_0_w(machine,0,port0a);
+			ay8910_write_port_0_w(machine,0,port0a);
 	}
 	else if ((last & 0x02) == 0x00 && (data & 0x02) == 0x02)
 	{
@@ -144,9 +144,9 @@ static WRITE8_HANDLER( zaccaria_port0b_w )
 	{
 		/* bit 2 goes to the 8910 #1 BC1 pin */
 		if (last & 0x04)
-			AY8910_control_port_1_w(machine,0,port0a);
+			ay8910_control_port_1_w(machine,0,port0a);
 		else
-			AY8910_write_port_1_w(machine,0,port0a);
+			ay8910_write_port_1_w(machine,0,port0a);
 	}
 	else if ((last & 0x08) == 0x00 && (data & 0x08) == 0x08)
 	{
@@ -268,7 +268,7 @@ static WRITE8_HANDLER( sound1_command_w )
 
 static WRITE8_HANDLER( mc1408_data_w )
 {
-	DAC_data_w(1,data);
+	dac_data_w(1,data);
 }
 
 
diff --git a/src/mame/drivers/zn.c b/src/mame/drivers/zn.c
index e052731e9db..28330b8c8ef 100644
--- a/src/mame/drivers/zn.c
+++ b/src/mame/drivers/zn.c
@@ -1247,10 +1247,10 @@ static ADDRESS_MAP_START( fx1a_sound_map, ADDRESS_SPACE_PROGRAM, 8 )
 	AM_RANGE(0x4000, 0x7fff) AM_READ(SMH_BANK10)	/* Fallthrough */
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0xc000, 0xdfff) AM_RAM
-	AM_RANGE(0xe000, 0xe000) AM_READWRITE(YM2610_status_port_0_A_r, YM2610_control_port_0_A_w)
-	AM_RANGE(0xe001, 0xe001) AM_READWRITE(YM2610_read_port_0_r, YM2610_data_port_0_A_w)
-	AM_RANGE(0xe002, 0xe002) AM_READWRITE(YM2610_status_port_0_B_r, YM2610_control_port_0_B_w)
-	AM_RANGE(0xe003, 0xe003) AM_WRITE(YM2610_data_port_0_B_w)
+	AM_RANGE(0xe000, 0xe000) AM_READWRITE(ym2610_status_port_0_a_r, ym2610_control_port_0_a_w)
+	AM_RANGE(0xe001, 0xe001) AM_READWRITE(ym2610_read_port_0_r, ym2610_data_port_0_a_w)
+	AM_RANGE(0xe002, 0xe002) AM_READWRITE(ym2610_status_port_0_b_r, ym2610_control_port_0_b_w)
+	AM_RANGE(0xe003, 0xe003) AM_WRITE(ym2610_data_port_0_b_w)
 	AM_RANGE(0xe200, 0xe200) AM_READWRITE(SMH_NOP, taitosound_slave_port_w)
 	AM_RANGE(0xe201, 0xe201) AM_READWRITE(taitosound_slave_comm_r, taitosound_slave_comm_w)
 	AM_RANGE(0xe400, 0xe403) AM_WRITE(SMH_NOP) /* pan */
@@ -1888,12 +1888,12 @@ static MACHINE_RESET( coh1002e )
 
 static READ16_HANDLER( psarc_ymf_r )
 {
-	return YMF271_0_r(machine,0);
+	return ymf271_0_r(machine,0);
 }
 
 static WRITE16_HANDLER( psarc_ymf_w )
 {
-	YMF271_0_w(machine, offset, data);
+	ymf271_0_w(machine, offset, data);
 }
 
 static READ16_HANDLER( psarc_latch_r )
@@ -2802,8 +2802,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( cbaj_z80_port_map, ADDRESS_SPACE_IO, 8)
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE( 0x84, 0x84 ) AM_READWRITE( YMZ280B_status_0_r, YMZ280B_register_0_w )
-	AM_RANGE( 0x85, 0x85 ) AM_READWRITE( YMZ280B_status_0_r, YMZ280B_data_0_w )
+	AM_RANGE( 0x84, 0x84 ) AM_READWRITE( ymz280b_status_0_r, ymz280b_register_0_w )
+	AM_RANGE( 0x85, 0x85 ) AM_READWRITE( ymz280b_status_0_r, ymz280b_data_0_w )
 	AM_RANGE( 0x90, 0x90 ) AM_READWRITE( cbaj_z80_latch_r, cbaj_z80_latch_w )
 	AM_RANGE( 0x91, 0x91 ) AM_READ( cbaj_z80_ready_r )
 ADDRESS_MAP_END
diff --git a/src/mame/drivers/zodiack.c b/src/mame/drivers/zodiack.c
index 8cf21a4bf2a..9ce32e49979 100644
--- a/src/mame/drivers/zodiack.c
+++ b/src/mame/drivers/zodiack.c
@@ -79,8 +79,8 @@ ADDRESS_MAP_END
 
 static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
 	ADDRESS_MAP_GLOBAL_MASK(0xff)
-	AM_RANGE(0x00, 0x00) AM_WRITE(AY8910_control_port_0_w)
-	AM_RANGE(0x01, 0x01) AM_WRITE(AY8910_write_port_0_w)
+	AM_RANGE(0x00, 0x00) AM_WRITE(ay8910_control_port_0_w)
+	AM_RANGE(0x01, 0x01) AM_WRITE(ay8910_write_port_0_w)
 ADDRESS_MAP_END
 
 
diff --git a/src/mame/includes/system16.h b/src/mame/includes/system16.h
index a9c1289c765..4819f5793f3 100644
--- a/src/mame/includes/system16.h
+++ b/src/mame/includes/system16.h
@@ -1,6 +1,7 @@
 /******************** NEW STUFF *******************/
 
 #include "video/segaic16.h"
+#include "sound/upd7759.h"
 
 /*----------- defined in video/segahang.c -----------*/
 
@@ -96,7 +97,7 @@ extern UINT16 *sys16_extraram2;
 extern UINT16 *sys16_extraram3;
 
 /* sound */
-extern const struct upd7759_interface sys16_upd7759_interface;
+extern const upd7759_interface sys16_upd7759_interface;
 
 extern int sys18_sound_info[4*2];
 
diff --git a/src/mame/machine/atari.c b/src/mame/machine/atari.c
index 50b32753eaa..f5355c96c3f 100644
--- a/src/mame/machine/atari.c
+++ b/src/mame/machine/atari.c
@@ -717,9 +717,9 @@ static UINT8 console_read(void)
 static void console_write(UINT8 data)
 {
 	if (data & 0x08)
-		DAC_data_w(0, -120);
+		dac_data_w(0, -120);
 	else
-		DAC_data_w(0, +120);
+		dac_data_w(0, +120);
 }
 
 
diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c
index b8826784866..762dbd37011 100644
--- a/src/mame/machine/dc.c
+++ b/src/mame/machine/dc.c
@@ -849,7 +849,7 @@ READ64_HANDLER( dc_aica_reg_r )
 
 //  mame_printf_verbose("AICA REG: [%08x] read %llx, mask %llx\n", 0x700000+reg*4, (UINT64)offset, mem_mask);
 
-	return (UINT64) AICA_0_r(machine, offset*2, 0xffff)<<shift;
+	return (UINT64) aica_0_r(machine, offset*2, 0xffff)<<shift;
 }
 
 WRITE64_HANDLER( dc_aica_reg_w )
@@ -875,18 +875,18 @@ WRITE64_HANDLER( dc_aica_reg_w )
 		}
         }
 
-	AICA_0_w(machine, offset*2, dat, shift ? ((mem_mask>>32)&0xffff) : (mem_mask & 0xffff));
+	aica_0_w(machine, offset*2, dat, shift ? ((mem_mask>>32)&0xffff) : (mem_mask & 0xffff));
 
 //  mame_printf_verbose("AICA REG: [%08x=%x] write %llx to %x, mask %llx\n", 0x700000+reg*4, dat, data, offset, mem_mask);
 }
 
 READ32_HANDLER( dc_arm_aica_r )
 {
-	return AICA_0_r(machine, offset*2, 0xffff);
+	return aica_0_r(machine, offset*2, 0xffff);
 }
 
 WRITE32_HANDLER( dc_arm_aica_w )
 {
-	AICA_0_w(machine, offset*2, data, mem_mask&0xffff);
+	aica_0_w(machine, offset*2, data, mem_mask&0xffff);
 }
 
diff --git a/src/mame/machine/leland.c b/src/mame/machine/leland.c
index fcf5c2759d7..3472e7c27c5 100644
--- a/src/mame/machine/leland.c
+++ b/src/mame/machine/leland.c
@@ -1168,7 +1168,7 @@ READ8_HANDLER( leland_master_input_r )
 
 		case 0x03:	/* /IGID */
 		case 0x13:
-			result = AY8910_read_port_0_r(machine, offset);
+			result = ay8910_read_port_0_r(machine, offset);
 			break;
 
 		case 0x10:	/* /GIN0 */
@@ -1207,11 +1207,11 @@ WRITE8_HANDLER( leland_master_output_w )
 			break;
 
 		case 0x0a:	/* /OGIA */
-			AY8910_control_port_0_w(machine, 0, data);
+			ay8910_control_port_0_w(machine, 0, data);
 			break;
 
 		case 0x0b:	/* /OGID */
-			AY8910_write_port_0_w(machine, 0, data);
+			ay8910_write_port_0_w(machine, 0, data);
 			break;
 
 		case 0x0c:	/* /BKXL */
diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c
index 807c4f0a1f7..946a6251fdd 100644
--- a/src/mame/machine/nmk004.c
+++ b/src/mame/machine/nmk004.c
@@ -356,8 +356,8 @@ static void fm_update(running_machine *machine, int channel)
 							fm->slot = read8(fm->current++);
 							if (channel < 3 || !(NMK004_state.fm_control[channel-3].flags & FM_FLAG_ACTIVE))
 							{
-								YM2203_control_port_0_w(machine, 0, 0x28);	// keyon/off
-								YM2203_write_port_0_w(machine, 0, channel % 3);
+								ym2203_control_port_0_w(machine, 0, 0x28);	// keyon/off
+								ym2203_write_port_0_w(machine, 0, channel % 3);
 							}
 							break;
 
@@ -605,8 +605,8 @@ static void fm_voices_update(running_machine *machine)
 
 			for (i = 0; i < 0x18; i++)
 			{
-				YM2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel);
-				YM2203_write_port_0_w(machine, 0, fm1->voice_params[i]);
+				ym2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel);
+				ym2203_write_port_0_w(machine, 0, fm1->voice_params[i]);
 			}
 		}
 
@@ -618,8 +618,8 @@ static void fm_voices_update(running_machine *machine)
 			{
 				for (i = 0; i < 0x18; i++)
 				{
-					YM2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel);
-					YM2203_write_port_0_w(machine, 0, fm2->voice_params[i]);
+					ym2203_control_port_0_w(machine, 0, ym2203_registers[i] + channel);
+					ym2203_write_port_0_w(machine, 0, fm2->voice_params[i]);
 				}
 			}
 		}
@@ -627,25 +627,25 @@ static void fm_voices_update(running_machine *machine)
 
 		if (fm1->flags & FM_FLAG_ACTIVE)
 		{
-			YM2203_control_port_0_w(machine, 0, 0xb0 + channel);	// self-feedback
-			YM2203_write_port_0_w(machine, 0, fm1->self_feedback);
+			ym2203_control_port_0_w(machine, 0, 0xb0 + channel);	// self-feedback
+			ym2203_write_port_0_w(machine, 0, fm1->self_feedback);
 
-			YM2203_control_port_0_w(machine, 0, 0xa4 + channel);	// F-number
-			YM2203_write_port_0_w(machine, 0, fm1->f_number >> 8);
+			ym2203_control_port_0_w(machine, 0, 0xa4 + channel);	// F-number
+			ym2203_write_port_0_w(machine, 0, fm1->f_number >> 8);
 
-			YM2203_control_port_0_w(machine, 0, 0xa0 + channel);	// F-number
-			YM2203_write_port_0_w(machine, 0, fm1->f_number & 0xff);
+			ym2203_control_port_0_w(machine, 0, 0xa0 + channel);	// F-number
+			ym2203_write_port_0_w(machine, 0, fm1->f_number & 0xff);
 		}
 		else
 		{
-			YM2203_control_port_0_w(machine, 0, 0xb0 + channel);	// self-feedback
-			YM2203_write_port_0_w(machine, 0, fm2->self_feedback);
+			ym2203_control_port_0_w(machine, 0, 0xb0 + channel);	// self-feedback
+			ym2203_write_port_0_w(machine, 0, fm2->self_feedback);
 
-			YM2203_control_port_0_w(machine, 0, 0xa4 + channel);	// F-number
-			YM2203_write_port_0_w(machine, 0, fm2->f_number >> 8);
+			ym2203_control_port_0_w(machine, 0, 0xa4 + channel);	// F-number
+			ym2203_write_port_0_w(machine, 0, fm2->f_number >> 8);
 
-			YM2203_control_port_0_w(machine, 0, 0xa0 + channel);	// F-number
-			YM2203_write_port_0_w(machine, 0, fm2->f_number & 0xff);
+			ym2203_control_port_0_w(machine, 0, 0xa0 + channel);	// F-number
+			ym2203_write_port_0_w(machine, 0, fm2->f_number & 0xff);
 		}
 
 
@@ -654,8 +654,8 @@ static void fm_voices_update(running_machine *machine)
 		{
 			fm1->flags &= ~FM_FLAG_MUST_SEND_KEYON;
 
-			YM2203_control_port_0_w(machine, 0, 0x28);	// keyon/off
-			YM2203_write_port_0_w(machine, 0, fm1->slot | channel);
+			ym2203_control_port_0_w(machine, 0, 0x28);	// keyon/off
+			ym2203_write_port_0_w(machine, 0, fm1->slot | channel);
 		}
 
 		if (fm2->flags & FM_FLAG_MUST_SEND_KEYON)
@@ -664,8 +664,8 @@ static void fm_voices_update(running_machine *machine)
 
 			if (!(fm1->flags & FM_FLAG_ACTIVE))
 			{
-				YM2203_control_port_0_w(machine, 0, 0x28);	// keyon/off
-				YM2203_write_port_0_w(machine, 0, fm2->slot | channel);
+				ym2203_control_port_0_w(machine, 0, 0x28);	// keyon/off
+				ym2203_write_port_0_w(machine, 0, fm2->slot | channel);
 			}
 		}
 	}
@@ -703,11 +703,11 @@ static void psg_update(running_machine *machine, int channel)
 			psg->flags &= ~PSG_FLAG_NOISE_NOT_ENABLED;
 
 			// enable noise, disable tone on this channel
-			YM2203_control_port_0_w(machine, 0, 0x07);
-			enable = YM2203_read_port_0_r(machine, 0);
+			ym2203_control_port_0_w(machine, 0, 0x07);
+			enable = ym2203_read_port_0_r(machine, 0);
 			enable |=  (0x01 << channel);	// disable tone
 			enable &= ~(0x08 << channel);	// enable noise
-			YM2203_write_port_0_w(machine, 0, enable);
+			ym2203_write_port_0_w(machine, 0, enable);
 		}
 
 
@@ -741,11 +741,11 @@ static void psg_update(running_machine *machine, int channel)
 							psg->flags &= ~PSG_FLAG_NOISE_NOT_ENABLED;
 
 							// enable noise, disable tone on this channel
-							YM2203_control_port_0_w(machine, 0, 0x07);
-							enable = YM2203_read_port_0_r(machine, 0);
+							ym2203_control_port_0_w(machine, 0, 0x07);
+							enable = ym2203_read_port_0_r(machine, 0);
 							enable |=  (0x01 << channel);	// disable tone
 							enable &= ~(0x08 << channel);	// enable noise
-							YM2203_write_port_0_w(machine, 0, enable);
+							ym2203_write_port_0_w(machine, 0, enable);
 							break;
 
 						case 0xf2:	// set volume shape
@@ -790,8 +790,8 @@ static void psg_update(running_machine *machine, int channel)
 							psg->volume_shape = 0;
 
 							// mute channel
-							YM2203_control_port_0_w(machine, 0, 8 + channel);
-							YM2203_write_port_0_w(machine, 0, 0);
+							ym2203_control_port_0_w(machine, 0, 8 + channel);
+							ym2203_write_port_0_w(machine, 0, 0);
 							return;
 					}
 				}
@@ -831,10 +831,10 @@ static void psg_update(running_machine *machine, int channel)
 
 					period >>= octave;
 
-					YM2203_control_port_0_w(machine, 0, 2 * channel + 1);
-					YM2203_write_port_0_w(machine, 0, (period & 0x0f00) >> 8);
-					YM2203_control_port_0_w(machine, 0, 2 * channel + 0);
-					YM2203_write_port_0_w(machine, 0, (period & 0x00ff));
+					ym2203_control_port_0_w(machine, 0, 2 * channel + 1);
+					ym2203_write_port_0_w(machine, 0, (period & 0x0f00) >> 8);
+					ym2203_control_port_0_w(machine, 0, 2 * channel + 0);
+					ym2203_write_port_0_w(machine, 0, (period & 0x00ff));
 
 					psg->note_period_hi_bits = (period & 0x0f00) >> 8;
 				}
@@ -847,15 +847,15 @@ static void psg_update(running_machine *machine, int channel)
 						psg->flags |= PSG_FLAG_NOISE_NOT_ENABLED;
 
 						// disable noise, enable tone on this channel
-						YM2203_control_port_0_w(machine, 0, 0x07);
-						enable = YM2203_read_port_0_r(machine, 0);
+						ym2203_control_port_0_w(machine, 0, 0x07);
+						enable = ym2203_read_port_0_r(machine, 0);
 						enable &= ~(0x01 << channel);	// enable tone
 						enable |=  (0x08 << channel);	// disable noise
-						YM2203_write_port_0_w(machine, 0, enable);
+						ym2203_write_port_0_w(machine, 0, enable);
 					}
 
-					YM2203_control_port_0_w(machine, 0, 0x06);	// noise period
-					YM2203_write_port_0_w(machine, 0, psg->note);
+					ym2203_control_port_0_w(machine, 0, 0x06);	// noise period
+					ym2203_write_port_0_w(machine, 0, psg->note);
 					psg->note_period_hi_bits = psg->note;
 				}
 			}
@@ -880,8 +880,8 @@ static void psg_update(running_machine *machine, int channel)
 				volume = 0;
 
 			// set volume
-			YM2203_control_port_0_w(machine, 0, 8 + channel);
-			YM2203_write_port_0_w(machine, 0, volume & 0x0f);
+			ym2203_control_port_0_w(machine, 0, 8 + channel);
+			ym2203_write_port_0_w(machine, 0, volume & 0x0f);
 		}
 	}
 }
@@ -1002,7 +1002,7 @@ void NMK004_irq(running_machine *machine, int irq)
 
 	if (!irq) return;
 
-	status = YM2203_status_port_0_r(machine,0);
+	status = ym2203_status_port_0_r(machine,0);
 
 	if (status & 1)	// timer A expired
 	{
@@ -1011,8 +1011,8 @@ void NMK004_irq(running_machine *machine, int irq)
 		update_music(machine);
 
 		// restart timer
-		YM2203_control_port_0_w(machine, 0, 0x27);
-		YM2203_write_port_0_w(machine, 0, 0x15);
+		ym2203_control_port_0_w(machine, 0, 0x27);
+		ym2203_write_port_0_w(machine, 0, 0x15);
 	}
 }
 
@@ -1031,13 +1031,13 @@ static TIMER_CALLBACK( real_nmk004_init )
 
 	NMK004_state.rom = memory_region(machine, "audio");
 
-	YM2203_control_port_0_w(machine, 0, 0x2f);
+	ym2203_control_port_0_w(machine, 0, 0x2f);
 
 	i = 0;
 	while (ym2203_init[i] != 0xff)
 	{
-		YM2203_control_port_0_w(machine, 0, ym2203_init[i++]);
-		YM2203_write_port_0_w(machine, 0, ym2203_init[i++]);
+		ym2203_control_port_0_w(machine, 0, ym2203_init[i++]);
+		ym2203_write_port_0_w(machine, 0, ym2203_init[i++]);
 	}
 
 	NMK004_state.oki_playing = 0;
diff --git a/src/mame/machine/system16.c b/src/mame/machine/system16.c
index 29abf6672d7..a8e985e6d91 100644
--- a/src/mame/machine/system16.c
+++ b/src/mame/machine/system16.c
@@ -60,7 +60,7 @@ static void sound_cause_nmi( int chip ){
 }
 
 
-const struct upd7759_interface sys16_upd7759_interface =
+const upd7759_interface sys16_upd7759_interface =
 {
 	sound_cause_nmi
 };
diff --git a/src/mame/machine/tatsumi.c b/src/mame/machine/tatsumi.c
index 429515685ff..328e788526a 100644
--- a/src/mame/machine/tatsumi.c
+++ b/src/mame/machine/tatsumi.c
@@ -349,7 +349,7 @@ WRITE16_HANDLER( tatsumi_v30_68000_w )
 // self-test in Tatsumi games.  Needs fixed, but hack it here for now.
 READ8_HANDLER(tatsumi_hack_ym2151_r)
 {
-	int r=YM2151_status_port_0_r(machine,0);
+	int r=ym2151_status_port_0_r(machine,0);
 
 	if (activecpu_get_pc()==0x2aca || activecpu_get_pc()==0x29fe
 		|| activecpu_get_pc()==0xf9721
diff --git a/src/mame/machine/williams.c b/src/mame/machine/williams.c
index a4224201dcf..ba2dee7030c 100644
--- a/src/mame/machine/williams.c
+++ b/src/mame/machine/williams.c
@@ -114,7 +114,7 @@ const pia6821_interface williams_pia_1_intf =
 const pia6821_interface williams_snd_pia_intf =
 {
 	/*inputs : A/B,CA/B1,CA/B2 */ 0, 0, 0, 0, 0, 0,
-	/*outputs: A/B,CA/B2       */ DAC_0_data_w, 0, 0, 0,
+	/*outputs: A/B,CA/B2       */ dac_0_data_w, 0, 0, 0,
 	/*irqs   : A/B             */ williams_snd_irq, williams_snd_irq
 };
 
@@ -138,7 +138,7 @@ const pia6821_interface lottofun_pia_0_intf =
 const pia6821_interface sinistar_snd_pia_intf =
 {
 	/*inputs : A/B,CA/B1,CA/B2 */ 0, 0, 0, 0, 0, 0,
-	/*outputs: A/B,CA/B2       */ DAC_0_data_w, 0, hc55516_0_digit_w, hc55516_0_clock_w,
+	/*outputs: A/B,CA/B2       */ dac_0_data_w, 0, hc55516_0_digit_w, hc55516_0_clock_w,
 	/*irqs   : A/B             */ williams_snd_irq, williams_snd_irq
 };
 
@@ -186,7 +186,7 @@ const pia6821_interface williams2_pia_1_intf =
 const pia6821_interface williams2_snd_pia_intf =
 {
 	/*inputs : A/B,CA/B1,CA/B2 */ 0, 0, 0, 0, 0, 0,
-	/*outputs: A/B,CA/B2       */ pia_1_portb_w, DAC_0_data_w, pia_1_cb1_w, 0,
+	/*outputs: A/B,CA/B2       */ pia_1_portb_w, dac_0_data_w, pia_1_cb1_w, 0,
 	/*irqs   : A/B             */ williams_snd_irq, williams_snd_irq
 };
 
@@ -234,7 +234,7 @@ const pia6821_interface tshoot_pia_1_intf =
 const pia6821_interface tshoot_snd_pia_intf =
 {
 	/*inputs : A/B,CA/B1,CA/B2 */ 0, 0, 0, 0, 0, 0,
-	/*outputs: A/B,CA/B2       */ pia_1_portb_w, DAC_0_data_w, pia_1_cb1_w, tshoot_maxvol_w,
+	/*outputs: A/B,CA/B2       */ pia_1_portb_w, dac_0_data_w, pia_1_cb1_w, tshoot_maxvol_w,
 	/*irqs   : A/B             */ williams_snd_irq, williams_snd_irq
 };
 
diff --git a/src/mame/video/cheekyms.c b/src/mame/video/cheekyms.c
index 20673f5e404..3ed58e2fac1 100644
--- a/src/mame/video/cheekyms.c
+++ b/src/mame/video/cheekyms.c
@@ -50,7 +50,7 @@ WRITE8_HANDLER( cheekyms_port_40_w )
 {
 	/* the lower bits probably trigger sound samples */
 
-	DAC_data_w(0, data ? 0x80 : 0);
+	dac_data_w(0, data ? 0x80 : 0);
 }