diff --git a/src/mame/atari/a2600.cpp b/src/mame/atari/a2600.cpp
index bb97f149e5e..c2078b6d124 100644
--- a/src/mame/atari/a2600.cpp
+++ b/src/mame/atari/a2600.cpp
@@ -523,17 +523,17 @@ static INPUT_PORTS_START( a2600 )
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset Game") PORT_CODE(KEYCODE_2)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Select Game") PORT_CODE(KEYCODE_1)
 	PORT_BIT ( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_DIPNAME( 0x08, 0x08, "TV Type" ) PORT_CODE(KEYCODE_C) PORT_TOGGLE
-	PORT_DIPSETTING(    0x08, "Color" )
-	PORT_DIPSETTING(    0x00, "B&W" )
+	PORT_CONFNAME( 0x08, 0x08, "TV Type" ) PORT_CODE(KEYCODE_C) PORT_TOGGLE
+	PORT_CONFSETTING(    0x08, "Color" )
+	PORT_CONFSETTING(    0x00, "B&W" )
 	PORT_BIT ( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT ( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_DIPNAME( 0x40, 0x00, "Left Diff. Switch" ) PORT_CODE(KEYCODE_3) PORT_TOGGLE
-	PORT_DIPSETTING(    0x40, "A" )
-	PORT_DIPSETTING(    0x00, "B" )
-	PORT_DIPNAME( 0x80, 0x00, "Right Diff. Switch" ) PORT_CODE(KEYCODE_4) PORT_TOGGLE
-	PORT_DIPSETTING(    0x80, "A" )
-	PORT_DIPSETTING(    0x00, "B" )
+	PORT_CONFNAME( 0x40, 0x00, "Left Diff. Switch" ) PORT_CODE(KEYCODE_3) PORT_TOGGLE
+	PORT_CONFSETTING(    0x40, "A" )
+	PORT_CONFSETTING(    0x00, "B" )
+	PORT_CONFNAME( 0x80, 0x00, "Right Diff. Switch" ) PORT_CODE(KEYCODE_4) PORT_TOGGLE
+	PORT_CONFSETTING(    0x80, "A" )
+	PORT_CONFSETTING(    0x00, "B" )
 INPUT_PORTS_END
 
 
@@ -542,9 +542,9 @@ static INPUT_PORTS_START(a2600_pop)
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset Game") PORT_CODE(KEYCODE_2)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Select Game") PORT_CODE(KEYCODE_1)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Tens") PORT_CODE(KEYCODE_3)  // Tens
-	PORT_DIPNAME( 0x08, 0x08, "TV Type" ) PORT_CODE(KEYCODE_C) PORT_TOGGLE
-	PORT_DIPSETTING(    0x08, "Color" )
-	PORT_DIPSETTING(    0x00, "B&W" )
+	PORT_CONFNAME( 0x08, 0x08, "TV Type" ) PORT_CODE(KEYCODE_C) PORT_TOGGLE
+	PORT_CONFSETTING(    0x08, "Color" )
+	PORT_CONFSETTING(    0x00, "B&W" )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Ones")  PORT_CODE(KEYCODE_4) // Ones
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Start") PORT_CODE(KEYCODE_5) // Start
 	// Left difficulty switch not present