diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c
index e7adeec667d..b5f709c8c9c 100644
--- a/src/mame/drivers/bfm_sc2.c
+++ b/src/mame/drivers/bfm_sc2.c
@@ -1480,7 +1480,7 @@ static ADDRESS_MAP_START( memmap_vid, AS_PROGRAM, 8, bfm_sc2_state )
 	AM_RANGE(0x2100, 0x21FF) AM_WRITENOP
 	AM_RANGE(0x2200, 0x22FF) AM_WRITENOP
 
-	AM_RANGE(0x3C00, 0x3C07) AM_READ_LEGACY( key_r   )
+	AM_RANGE(0x3C00, 0x3C07) AM_READ_LEGACY(key_r   )
 	AM_RANGE(0x3C80, 0x3C80) AM_WRITE_LEGACY(e2ram_w )
 
 	AM_RANGE(0x3E00, 0x3E00) AM_READWRITE_LEGACY(vid_uart_ctrl_r, vid_uart_ctrl_w)		// video uart control reg
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 4fa2b581db7..28763d68314 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -75,9 +75,9 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, hcastle_state )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x9800, 0x987f) AM_DEVREADWRITE_LEGACY("konami2", k051649_waveform_r, k051649_waveform_w)
-	AM_RANGE(0x9880, 0x9889) AM_DEVWRITE_LEGACY(   "konami2", k051649_frequency_w)
-	AM_RANGE(0x988a, 0x988e) AM_DEVWRITE_LEGACY(   "konami2", k051649_volume_w)
-	AM_RANGE(0x988f, 0x988f) AM_DEVWRITE_LEGACY(   "konami2", k051649_keyonoff_w)
+	AM_RANGE(0x9880, 0x9889) AM_DEVWRITE_LEGACY("konami2", k051649_frequency_w)
+	AM_RANGE(0x988a, 0x988e) AM_DEVWRITE_LEGACY("konami2", k051649_volume_w)
+	AM_RANGE(0x988f, 0x988f) AM_DEVWRITE_LEGACY("konami2", k051649_keyonoff_w)
 	AM_RANGE(0x98e0, 0x98ff) AM_DEVREADWRITE_LEGACY("konami2", k051649_test_r, k051649_test_w)
 	AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
 	AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("konami1", k007232_r, k007232_w)
diff --git a/src/mame/drivers/hexion.c b/src/mame/drivers/hexion.c
index ff80e420ffd..f6ba4781c23 100644
--- a/src/mame/drivers/hexion.c
+++ b/src/mame/drivers/hexion.c
@@ -119,9 +119,9 @@ static ADDRESS_MAP_START( hexion_map, AS_PROGRAM, 8, hexion_state )
 	AM_RANGE(0xc000, 0xdffe) AM_READWRITE_LEGACY(hexion_bankedram_r, hexion_bankedram_w)
 	AM_RANGE(0xdfff, 0xdfff) AM_WRITE_LEGACY(hexion_bankctrl_w)
 	AM_RANGE(0xe800, 0xe87f) AM_DEVREADWRITE_LEGACY("konami", k051649_waveform_r, k051649_waveform_w)
-	AM_RANGE(0xe880, 0xe889) AM_DEVWRITE_LEGACY(   "konami", k051649_frequency_w)
-	AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE_LEGACY(   "konami", k051649_volume_w)
-	AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE_LEGACY(   "konami", k051649_keyonoff_w)
+	AM_RANGE(0xe880, 0xe889) AM_DEVWRITE_LEGACY("konami", k051649_frequency_w)
+	AM_RANGE(0xe88a, 0xe88e) AM_DEVWRITE_LEGACY("konami", k051649_volume_w)
+	AM_RANGE(0xe88f, 0xe88f) AM_DEVWRITE_LEGACY("konami", k051649_keyonoff_w)
 	AM_RANGE(0xe8e0, 0xe8ff) AM_DEVREADWRITE_LEGACY("konami", k051649_test_r, k051649_test_w)
 	AM_RANGE(0xf000, 0xf00f) AM_DEVREADWRITE_LEGACY("k053252",k053252_r,k053252_w)
 	AM_RANGE(0xf200, 0xf200) AM_DEVWRITE("oki", okim6295_device, write)
diff --git a/src/mame/drivers/nemesis.c b/src/mame/drivers/nemesis.c
index c19c9098c28..aeeaeee68cf 100644
--- a/src/mame/drivers/nemesis.c
+++ b/src/mame/drivers/nemesis.c
@@ -601,9 +601,9 @@ static ADDRESS_MAP_START( city_sound_map, AS_PROGRAM, 8, nemesis_state )
 	AM_RANGE(0x0000, 0x7fff) AM_ROM
 	AM_RANGE(0x8000, 0x87ff) AM_RAM
 	AM_RANGE(0x9800, 0x987f) AM_DEVREADWRITE_LEGACY("k051649", k051649_waveform_r, k051649_waveform_w)
-	AM_RANGE(0x9880, 0x9889) AM_DEVWRITE_LEGACY(   "k051649", k051649_frequency_w)
-	AM_RANGE(0x988a, 0x988e) AM_DEVWRITE_LEGACY(   "k051649", k051649_volume_w)
-	AM_RANGE(0x988f, 0x988f) AM_DEVWRITE_LEGACY(   "k051649", k051649_keyonoff_w)
+	AM_RANGE(0x9880, 0x9889) AM_DEVWRITE_LEGACY("k051649", k051649_frequency_w)
+	AM_RANGE(0x988a, 0x988e) AM_DEVWRITE_LEGACY("k051649", k051649_volume_w)
+	AM_RANGE(0x988f, 0x988f) AM_DEVWRITE_LEGACY("k051649", k051649_keyonoff_w)
 	AM_RANGE(0x98e0, 0x98ff) AM_DEVREADWRITE_LEGACY("k051649", k051649_test_r, k051649_test_w)
 	AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
 	AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("k007232", k007232_r, k007232_w)
diff --git a/src/mame/drivers/uapce.c b/src/mame/drivers/uapce.c
index e1803eb776a..ec5e515b943 100644
--- a/src/mame/drivers/uapce.c
+++ b/src/mame/drivers/uapce.c
@@ -234,9 +234,9 @@ static ADDRESS_MAP_START( z80_map, AS_PROGRAM, 8, uapce_state )
 	AM_RANGE( 0x0000, 0x07FF) AM_ROM
 	AM_RANGE( 0x0800, 0x0FFF) AM_RAM
 	AM_RANGE( 0x1000, 0x17FF) AM_WRITE_LEGACY(jamma_if_control_latch_w )
-	AM_RANGE( 0x1800, 0x1FFF) AM_READ_LEGACY( jamma_if_read_dsw )
+	AM_RANGE( 0x1800, 0x1FFF) AM_READ_LEGACY(jamma_if_read_dsw )
 	AM_RANGE( 0x2000, 0x27FF) AM_READ_PORT( "COIN" )
-	AM_RANGE( 0x2800, 0x2FFF) AM_READ_LEGACY( jamma_if_control_latch_r )
+	AM_RANGE( 0x2800, 0x2FFF) AM_READ_LEGACY(jamma_if_control_latch_r )
 ADDRESS_MAP_END