diff --git a/src/mame/drivers/hazeltine.cpp b/src/mame/drivers/hazeltine.cpp
index c14a73c98e3..b6a399c260c 100644
--- a/src/mame/drivers/hazeltine.cpp
+++ b/src/mame/drivers/hazeltine.cpp
@@ -16,10 +16,10 @@ Hazeltine Esprit terminals.
 #include "video/mc6845.h"
 #include "screen.h"
 
-class hazeltine_state : public driver_device
+class esprit_state : public driver_device
 {
 public:
-	hazeltine_state(const machine_config &mconfig, device_type type, const char *tag)
+	esprit_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_p_chargen(*this, "chargen")
@@ -37,7 +37,7 @@ private:
 	optional_device<palette_device> m_palette;
 };
 
-static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, hazeltine_state )
+static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, esprit_state )
 	ADDRESS_MAP_GLOBAL_MASK (0x7fff)
 	AM_RANGE(0x0058,0x0058) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w)
 	AM_RANGE(0x0059,0x0059) AM_DEVREADWRITE("crtc", mc6845_device, register_r, register_w)
@@ -46,7 +46,7 @@ static ADDRESS_MAP_START( mem_map, AS_PROGRAM, 8, hazeltine_state )
 	AM_RANGE(0x7000,0x7fff) AM_ROM AM_REGION("roms", 0)
 ADDRESS_MAP_END
 
-static ADDRESS_MAP_START( mem3_map, AS_PROGRAM, 8, hazeltine_state )
+static ADDRESS_MAP_START( mem3_map, AS_PROGRAM, 8, esprit_state )
 	AM_RANGE(0x0000,0x202f) AM_RAM
 	AM_RANGE(0x2030,0x3fff) AM_RAM AM_SHARE("videoram") // it might start at 3000
 	AM_RANGE(0x81c0,0x81c0) AM_DEVREADWRITE("crtc", mc6845_device, status_r, address_w)
@@ -54,10 +54,10 @@ static ADDRESS_MAP_START( mem3_map, AS_PROGRAM, 8, hazeltine_state )
 	AM_RANGE(0xe000,0xffff) AM_ROM AM_REGION("roms", 0)
 ADDRESS_MAP_END
 
-static INPUT_PORTS_START( hazeltine )
+static INPUT_PORTS_START( esprit )
 INPUT_PORTS_END
 
-MC6845_UPDATE_ROW( hazeltine_state::crtc_update_row )
+MC6845_UPDATE_ROW( esprit_state::crtc_update_row )
 {
 	const rgb_t *pens = m_palette->palette()->entry_list_raw();
 	uint8_t chr,gfx;
@@ -85,7 +85,7 @@ MC6845_UPDATE_ROW( hazeltine_state::crtc_update_row )
 }
 
 /* F4 Character Displayer */
-static const gfx_layout hazeltine_charlayout =
+static const gfx_layout esprit_charlayout =
 {
 	8, 12,                  /* 8 x 12 characters */
 	256,                    /* 256 characters */
@@ -98,11 +98,11 @@ static const gfx_layout hazeltine_charlayout =
 	8*16                    /* every char takes 16 bytes */
 };
 
-static GFXDECODE_START( hazeltine )
-	GFXDECODE_ENTRY( "chargen", 0x0000, hazeltine_charlayout, 0, 1 )
+static GFXDECODE_START( esprit )
+	GFXDECODE_ENTRY( "chargen", 0x0000, esprit_charlayout, 0, 1 )
 GFXDECODE_END
 
-DRIVER_INIT_MEMBER( hazeltine_state, init )
+DRIVER_INIT_MEMBER( esprit_state, init )
 {
 	// chargen is incomplete, copy the first half into the vacant second half
 	for (u16 i = 0; i < 0x800; i++)
@@ -110,7 +110,7 @@ DRIVER_INIT_MEMBER( hazeltine_state, init )
 }
 
 
-static MACHINE_CONFIG_START( hazeltine )
+static MACHINE_CONFIG_START( esprit )
 	MCFG_CPU_ADD("maincpu", M6502, 1000000) // no idea of clock
 	MCFG_CPU_PROGRAM_MAP(mem_map)
 
@@ -121,22 +121,22 @@ static MACHINE_CONFIG_START( hazeltine )
 	MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update)
 	MCFG_SCREEN_SIZE(32*8, 32*8)
 	MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1)
-	MCFG_GFXDECODE_ADD("gfxdecode", "palette", hazeltine)
+	MCFG_GFXDECODE_ADD("gfxdecode", "palette", esprit)
 	MCFG_PALETTE_ADD_MONOCHROME("palette")
 
 	/* Devices */
 	MCFG_MC6845_ADD("crtc", MC6845, "screen", 1000000) // clk unknown
 	MCFG_MC6845_SHOW_BORDER_AREA(false)
 	MCFG_MC6845_CHAR_WIDTH(8)
-	MCFG_MC6845_UPDATE_ROW_CB(hazeltine_state, crtc_update_row)
+	MCFG_MC6845_UPDATE_ROW_CB(esprit_state, crtc_update_row)
 MACHINE_CONFIG_END
 
-static MACHINE_CONFIG_DERIVED( hazeltine3, hazeltine )
+static MACHINE_CONFIG_DERIVED( esprit3, esprit )
 	MCFG_CPU_MODIFY("maincpu")
 	MCFG_CPU_PROGRAM_MAP(mem3_map)
 MACHINE_CONFIG_END
 
-ROM_START( hazeltine )
+ROM_START( esprit )
 	// Esprit
 	ROM_REGION( 0x1000, "roms", 0 )
 	ROM_LOAD( "hazeltine_esprit.u19",    0x0000, 0x1000, CRC(6fdec792) SHA1(a1d1d68c8793e7e15ab5cd17682c299dff3985cb) )
@@ -144,7 +144,7 @@ ROM_START( hazeltine )
 	ROM_LOAD( "hazeltine_esprit.u26",    0x0000, 0x0804, CRC(93f45f13) SHA1(1f493b44124c348759469e24fdfa8b7c52fe6fac) )
 ROM_END
 
-ROM_START( hazeltine3 )
+ROM_START( esprit3 )
 	// Esprit III
 	ROM_REGION( 0x10000, "roms", 0 )
 	ROM_LOAD( "hazeltine_espritiii.u5",  0x0000, 0x2000, CRC(fd63dad1) SHA1(b2a3e7db8480b28cab2b2834ad89fb6257f13cba) )
@@ -152,5 +152,5 @@ ROM_START( hazeltine3 )
 	ROM_LOAD( "hazeltine_espritiii.u19", 0x0000, 0x1000, CRC(33e4a8ef) SHA1(e19c84a3c5f94812928ea84bab3ede7970dd5e72) )
 ROM_END
 
-COMP( 1981, hazeltine,  0,         0, hazeltine,  hazeltine, hazeltine_state, init, "Hazeltine", "Esprit", MACHINE_IS_SKELETON )
-COMP( 1981, hazeltine3, hazeltine, 0, hazeltine3, hazeltine, hazeltine_state, 0,    "Hazeltine", "Esprit III", MACHINE_IS_SKELETON )
+COMP( 1981, esprit,  0,         0, esprit,  esprit, esprit_state, init, "Hazeltine", "Esprit", MACHINE_IS_SKELETON )
+COMP( 1981, esprit3, esprit,    0, esprit3, esprit, esprit_state, 0,    "Hazeltine", "Esprit III", MACHINE_IS_SKELETON )
diff --git a/src/mame/mame.lst b/src/mame/mame.lst
index 16ee425137d..a9bc6c2e1f9 100644
--- a/src/mame/mame.lst
+++ b/src/mame/mame.lst
@@ -14561,8 +14561,8 @@ hg_frd                          // Fruit Deuce
 hazl1500                        // Hazeltine 1500 (c) 1977
 
 @source:hazeltine.cpp
-hazeltine                       // Hazeltine Esprit
-hazeltine3                      // Hazeltine Esprit III
+esprit                          // Hazeltine Esprit
+esprit3                         // Hazeltine Esprit III
 
 @source:hcastle.cpp
 akumajou                        // GX768 (c) 1988 (Japan)