diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 53b47c4c1..155e6aecc 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -670,7 +670,7 @@ extern int machine_at_tek932_init(const machine_t *);
 
 extern int machine_at_acerv30_init(const machine_t *);
 extern int machine_at_apollo_init(const machine_t *);
-extern int machine_at_optiplex_gxl_init(const machine_t *);
+extern int machine_at_optiplexgxl_init(const machine_t *);
 extern int machine_at_zappa_init(const machine_t *);
 extern int machine_at_powermatev_init(const machine_t *);
 extern int machine_at_hawk_init(const machine_t *);
@@ -750,7 +750,7 @@ extern int machine_at_gw2kte_init(const machine_t *);
 extern int machine_at_ma23c_init(const machine_t *);
 extern int machine_at_nupro592_init(const machine_t *);
 extern int machine_at_tx97_init(const machine_t *);
-extern int machine_at_optiplex_gn_init(const machine_t *);
+extern int machine_at_optiplexgn_init(const machine_t *);
 extern int machine_at_ym430tx_init(const machine_t *);
 extern int machine_at_thunderbolt_init(const machine_t *);
 extern int machine_at_an430tx_init(const machine_t *);
@@ -819,7 +819,7 @@ extern int machine_at_p65up5_cpknd_init(const machine_t *);
 extern int machine_at_kn97_init(const machine_t *);
 
 extern int machine_at_lx6_init(const machine_t *);
-extern int machine_at_optiplex_gxa_init(const machine_t *);
+extern int machine_at_optiplexgxa_init(const machine_t *);
 extern int machine_at_spitfire_init(const machine_t *);
 extern int machine_at_ma30d_init(const machine_t *);
 
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index a147d0e13..280462858 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -151,11 +151,11 @@ machine_at_lx6_init(const machine_t *model)
 }
 
 int
-machine_at_optiplex_gxa_init(const machine_t *model)
+machine_at_optiplexgxa_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/optiplex_gxa/DELL.ROM",
+    ret = bios_load_linear("roms/machines/optiplexgxa/DELL.ROM",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
diff --git a/src/machine/m_at_socket5.c b/src/machine/m_at_socket5.c
index 442281811..0d50fead8 100644
--- a/src/machine/m_at_socket5.c
+++ b/src/machine/m_at_socket5.c
@@ -238,11 +238,11 @@ machine_at_apollo_init(const machine_t *model)
 }
 
 int
-machine_at_optiplex_gxl_init(const machine_t *model)
+machine_at_optiplexgxl_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/optiplex_gxl/DELL.ROM",
+    ret = bios_load_linear("roms/machines/optiplexgxl/DELL.ROM",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c
index d4b71f92f..dbc59ef17 100644
--- a/src/machine/m_at_socket7.c
+++ b/src/machine/m_at_socket7.c
@@ -970,11 +970,11 @@ machine_at_tx97_init(const machine_t *model)
 }
 
 int
-machine_at_optiplex_gn_init(const machine_t *model)
+machine_at_optiplexgn_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/optiplex_gn/DELL.ROM",
+    ret = bios_load_linear("roms/machines/optiplexgn/DELL.ROM",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 63d19c8c6..4c6d90cea 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -10549,10 +10549,10 @@ const machine_t machines[] = {
     /* Has a National Semiconductor PC87332VLJ Super I/O with AMIKey 'F' KBC firmware. */
     {
         .name = "[i430FX] Dell OptiPlex GXL/GXM",
-        .internal_name = "optiplex_gxl",
+        .internal_name = "optiplexgxl",
         .type = MACHINE_TYPE_SOCKET5,
         .chipset = MACHINE_CHIPSET_INTEL_430FX,
-        .init = machine_at_optiplex_gxl_init,
+        .init = machine_at_optiplexgxl_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -13147,10 +13147,10 @@ const machine_t machines[] = {
      */
     {
         .name = "[i430TX] Dell OptiPlex GN+",
-        .internal_name = "optiplex_gn",
+        .internal_name = "optiplexgn",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_INTEL_430TX,
-        .init = machine_at_optiplex_gn_init,
+        .init = machine_at_optiplexgn_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -15210,10 +15210,10 @@ const machine_t machines[] = {
        firmwares: AMI '5' MegaKey, Phoenix MultiKey/42 1.37, or Phoenix MultiKey/42i 4.16. */
     {
         .name = "[i440LX] Dell OptiPlex GXa",
-        .internal_name = "optiplex_gxa",
+        .internal_name = "optiplexgxa",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440LX,
-        .init = machine_at_optiplex_gxa_init,
+        .init = machine_at_optiplexgxa_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,