diff --git a/src/mess/drivers/dolphunk.c b/src/mess/drivers/dolphunk.c
index aa98e40d208..11a1005d071 100644
--- a/src/mess/drivers/dolphunk.c
+++ b/src/mess/drivers/dolphunk.c
@@ -2,7 +2,7 @@
 // copyright-holders:Robbbert
 /***************************************************************************
 
-        Dolphin
+        Dolphin / Dauphin
 
         2010-04-08 Skeleton driver.
         2012-05-20 Fixed keyboard, added notes & speaker [Robbbert]
@@ -88,10 +88,10 @@
 #include "dolphunk.lh"
 
 
-class dolphunk_state : public driver_device
+class dauphin_state : public driver_device
 {
 public:
-	dolphunk_state(const machine_config &mconfig, device_type type, const char *tag)
+	dauphin_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_speaker(*this, "speaker")
@@ -103,7 +103,7 @@ public:
 	DECLARE_READ8_MEMBER(port07_r);
 	DECLARE_WRITE8_MEMBER(port00_w);
 	DECLARE_WRITE8_MEMBER(port06_w);
-	TIMER_DEVICE_CALLBACK_MEMBER(dolphin_c);
+	TIMER_DEVICE_CALLBACK_MEMBER(dauphin_c);
 private:
 	UINT8 m_cass_data;
 	UINT8 m_last_key;
@@ -114,28 +114,28 @@ private:
 	required_device<cassette_image_device> m_cass;
 };
 
-READ8_MEMBER( dolphunk_state::cass_r )
+READ8_MEMBER( dauphin_state::cass_r )
 {
 	return (m_cass->input() > 0.03) ? 1 : 0;
 }
 
-WRITE_LINE_MEMBER( dolphunk_state::cass_w )
+WRITE_LINE_MEMBER( dauphin_state::cass_w )
 {
 	m_cass_state = state; // get flag bit
 }
 
-WRITE8_MEMBER( dolphunk_state::port00_w )
+WRITE8_MEMBER( dauphin_state::port00_w )
 {
 	output_set_digit_value(offset, data);
 }
 
-WRITE8_MEMBER( dolphunk_state::port06_w )
+WRITE8_MEMBER( dauphin_state::port06_w )
 {
 	m_speaker_state ^=1;
 	m_speaker->level_w(m_speaker_state);
 }
 
-READ8_MEMBER( dolphunk_state::port07_r )
+READ8_MEMBER( dauphin_state::port07_r )
 {
 	UINT8 keyin, i, data = 0x40;
 
@@ -161,7 +161,7 @@ READ8_MEMBER( dolphunk_state::port07_r )
 	return data;
 }
 
-TIMER_DEVICE_CALLBACK_MEMBER(dolphunk_state::dolphin_c)
+TIMER_DEVICE_CALLBACK_MEMBER(dauphin_state::dauphin_c)
 {
 	m_cass_data++;
 
@@ -171,14 +171,14 @@ TIMER_DEVICE_CALLBACK_MEMBER(dolphunk_state::dolphin_c)
 		m_cass->output(BIT(m_cass_data, 0) ? -1.0 : +1.0); // 2000Hz
 }
 
-static ADDRESS_MAP_START( dolphunk_mem, AS_PROGRAM, 8, dolphunk_state )
+static ADDRESS_MAP_START( dauphin_mem, AS_PROGRAM, 8, dauphin_state )
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE( 0x0000, 0x01ff) AM_ROM
 	AM_RANGE( 0x0200, 0x02ff) AM_RAM
 	AM_RANGE( 0x0c00, 0x0fff) AM_ROM
 ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( dolphunk_io, AS_IO, 8, dolphunk_state )
+static ADDRESS_MAP_START( dauphin_io, AS_IO, 8, dauphin_state )
 	ADDRESS_MAP_UNMAP_HIGH
 	AM_RANGE(0x00, 0x03) AM_WRITE(port00_w) // 4-led display
 	AM_RANGE(0x06, 0x06) AM_WRITE(port06_w)  // speaker (NOT a keyclick)
@@ -188,7 +188,7 @@ static ADDRESS_MAP_START( dolphunk_io, AS_IO, 8, dolphunk_state )
 ADDRESS_MAP_END
 
 /* Input ports */
-static INPUT_PORTS_START( dolphunk )
+static INPUT_PORTS_START( dauphin )
 	PORT_START("X0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0')
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1')
@@ -215,12 +215,12 @@ static INPUT_PORTS_START( dolphunk )
 INPUT_PORTS_END
 
 
-static MACHINE_CONFIG_START( dolphunk, dolphunk_state )
+static MACHINE_CONFIG_START( dauphin, dauphin_state )
 	/* basic machine hardware */
 	MCFG_CPU_ADD("maincpu",S2650, XTAL_1MHz)
-	MCFG_CPU_PROGRAM_MAP(dolphunk_mem)
-	MCFG_CPU_IO_MAP(dolphunk_io)
-	MCFG_S2650_FLAG_HANDLER(WRITELINE(dolphunk_state, cass_w))
+	MCFG_CPU_PROGRAM_MAP(dauphin_mem)
+	MCFG_CPU_IO_MAP(dauphin_io)
+	MCFG_S2650_FLAG_HANDLER(WRITELINE(dauphin_state, cass_w))
 
 	/* video hardware */
 	MCFG_DEFAULT_LAYOUT(layout_dolphunk)
@@ -234,11 +234,11 @@ static MACHINE_CONFIG_START( dolphunk, dolphunk_state )
 	MCFG_CASSETTE_ADD( "cassette", default_cassette_interface )
 	MCFG_SOUND_WAVE_ADD(WAVE_TAG, "cassette")
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
-	MCFG_TIMER_DRIVER_ADD_PERIODIC("dolphin_c", dolphunk_state, dolphin_c, attotime::from_hz(4000))
+	MCFG_TIMER_DRIVER_ADD_PERIODIC("dauphin_c", dauphin_state, dauphin_c, attotime::from_hz(4000))
 MACHINE_CONFIG_END
 
 /* ROM definition */
-ROM_START( dolphunk )
+ROM_START( dauphin )
 	ROM_REGION( 0x8000, "maincpu", 0 )
 	ROM_LOAD( "dolphin_mo.rom", 0x0000, 0x0100, CRC(a8811f48) SHA1(233c629dc20fac286c8c1559e461bb0b742a675e) )
 	// This one is used in winarcadia but it is a bad dump, we use the corrected one above
@@ -255,5 +255,5 @@ ROM_END
 
 /* Driver */
 
-/*    YEAR  NAME       PARENT   COMPAT   MACHINE    INPUT     CLASS         INIT     COMPANY             FULLNAME       FLAGS */
-COMP( 1979, dolphunk,  0,       0,       dolphunk,  dolphunk, driver_device, 0,     "LCD EPFL Stoppani", "Dauphin", 0 )
+/*    YEAR  NAME       PARENT   COMPAT   MACHINE    INPUT     CLASS         INIT     COMPANY             FULLNAME   FLAGS */
+COMP( 1979, dauphin,   0,       0,       dauphin,  dauphin, driver_device, 0,     "LCD EPFL Stoppani", "Dauphin", 0 )
diff --git a/src/mess/mess.lst b/src/mess/mess.lst
index fb7baba77d9..0baf7361c04 100644
--- a/src/mess/mess.lst
+++ b/src/mess/mess.lst
@@ -2136,7 +2136,7 @@ cd2650
 pipbug
 elektor
 instruct
-dolphunk
+dauphin
 chaos
 z80dev
 pegasus