diff --git a/src/mame/layout/ctk530.lay b/src/mame/layout/ctk530.lay
index 5756c0065b1..e660dc21bce 100644
--- a/src/mame/layout/ctk530.lay
+++ b/src/mame/layout/ctk530.lay
@@ -325,8 +325,8 @@ license:CC0-1.0
 		<element ref="blackkey"    inputtag="maincpu:kbd:FI6" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="maincpu:kbd:FI6" inputmask="0x08"><bounds x="2529" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="maincpu:kbd:FI6" inputmask="0x40"><bounds x="2669" y="108" width="44" height="324" /></element>
-		<element ref="blackkey"    inputtag="maincpu:kbd:FI7" inputmask="0x04"><bounds x="2857" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="maincpu:kbd:FI7" inputmask="0x01"><bounds x="2763" y="108" width="44" height="324" /></element>
+		<element ref="blackkey"    inputtag="maincpu:kbd:FI7" inputmask="0x04"><bounds x="2857" y="108" width="44" height="324" /></element>
 		<element ref="whitekey-l"  inputtag="maincpu:kbd:FI6" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
 		<element ref="whitekey-m"  inputtag="maincpu:kbd:FI6" inputmask="0x04"><bounds x="2460" y="108" width="79" height="504" /></element>
 		<element ref="whitekey-r"  inputtag="maincpu:kbd:FI6" inputmask="0x10"><bounds x="2542" y="108" width="79" height="504" /></element>
diff --git a/src/mame/layout/psr150.lay b/src/mame/layout/psr150.lay
index bf5be3c4f50..76f6415ea79 100644
--- a/src/mame/layout/psr150.lay
+++ b/src/mame/layout/psr150.lay
@@ -289,8 +289,8 @@ license:CC0-1.0
 		<element ref="blackkey"    inputtag="KEY8" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="KEY8" inputmask="0x10"><bounds x="2529" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="KEY8" inputmask="0x01"><bounds x="2669" y="108" width="44" height="324" /></element>
-		<element ref="blackkey"    inputtag="KEY0" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="KEY0" inputmask="0x20"><bounds x="2763" y="108" width="44" height="324" /></element>
+		<element ref="blackkey"    inputtag="KEY0" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
 		<element ref="whitekey-l"  inputtag="KEY3" inputmask="0x01"><bounds x="2378" y="108" width="79" height="504" /></element>
 		<element ref="whitekey-m"  inputtag="KEY8" inputmask="0x20"><bounds x="2460" y="108" width="79" height="504" /></element>
 		<element ref="whitekey-r"  inputtag="KEY8" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
diff --git a/src/mame/layout/psr180.lay b/src/mame/layout/psr180.lay
index 78d2ead22d7..a82f91e1fd3 100644
--- a/src/mame/layout/psr180.lay
+++ b/src/mame/layout/psr180.lay
@@ -434,8 +434,8 @@ license:CC0-1.0
 		<element ref="blackkey"    inputtag="KEY9" inputmask="0x02"><bounds x="2426" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="KEY9" inputmask="0x10"><bounds x="2529" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="KEY9" inputmask="0x04"><bounds x="2669" y="108" width="44" height="324" /></element>
-		<element ref="blackkey"    inputtag="KEY10" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
 		<element ref="blackkey"    inputtag="KEY10" inputmask="0x20"><bounds x="2763" y="108" width="44" height="324" /></element>
+		<element ref="blackkey"    inputtag="KEY10" inputmask="0x08"><bounds x="2857" y="108" width="44" height="324" /></element>
 		<element ref="whitekey-l"  inputtag="KEY8" inputmask="0x04"><bounds x="2378" y="108" width="79" height="504" /></element>
 		<element ref="whitekey-m"  inputtag="KEY9" inputmask="0x20"><bounds x="2460" y="108" width="79" height="504" /></element>
 		<element ref="whitekey-r"  inputtag="KEY9" inputmask="0x08"><bounds x="2542" y="108" width="79" height="504" /></element>
diff --git a/src/mame/yamaha/ympsr150.cpp b/src/mame/yamaha/ympsr150.cpp
index 0b5ca02c4c0..68ead6ce70d 100644
--- a/src/mame/yamaha/ympsr150.cpp
+++ b/src/mame/yamaha/ympsr150.cpp
@@ -500,9 +500,9 @@ INPUT_PORTS_START(psr150)
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("C6")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("G5")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("B5")
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("G5#")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("A5#")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("A5")
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("A5#")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER )  PORT_NAME("G5#")
 	PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
 
 	PORT_START("KEY1")
@@ -1372,9 +1372,9 @@ INPUT_PORTS_START(psr180_keys) // also psr190
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("B5")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("G5")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("C6")
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("G5#")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("A5#")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("A5")
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("A5#")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("G5#")
 	PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNUSED )
 INPUT_PORTS_END
 
@@ -1626,10 +1626,6 @@ INPUT_PORTS_START(psr190)
 	PORT_MODIFY("PF")
 	PORT_BIT( 0x1f, IP_ACTIVE_LOW,  IPT_OUTPUT ) PORT_WRITE_LINE_MEMBER(psr150_state, KEY_OUT_BITS(11, 5))
 
-	PORT_MODIFY("KEY10") // these are swapped on psr180, but not on psr190
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("A5#")
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_OTHER  ) PORT_NAME("G5#")
-
 	PORT_START("KEY11")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_2) PORT_NAME("Sync Start")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_6) PORT_NAME("Main / Auto Fill B")