diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index 73b27afbf..06443e101 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -638,7 +638,7 @@ extern int machine_at_8500tuc_init(const machine_t *);
 extern int machine_at_p55t2s_init(const machine_t *);
 
 extern int machine_at_p5vxb_init(const machine_t *);
-extern int machine_at_dell_430vx_init(const machine_t *);
+extern int machine_at_dellhannibalp_init(const machine_t *);
 extern int machine_at_gw2kte_init(const machine_t *);
 
 extern int machine_at_ap5s_init(const machine_t *);
@@ -688,7 +688,7 @@ extern int machine_at_ficpa2012_init(const machine_t *);
 
 extern int machine_at_r534f_init(const machine_t *);
 extern int machine_at_ms5146_init(const machine_t *);
-extern int machine_at_cb52x_si_init(const machine_t *);
+extern int machine_at_cb52xsi_init(const machine_t *);
 
 extern int machine_at_m560_init(const machine_t *);
 extern int machine_at_ms5164_init(const machine_t *);
@@ -710,7 +710,7 @@ extern int machine_at_p6rp4_init(const machine_t *);
 
 extern int machine_at_686nx_init(const machine_t *);
 extern int machine_at_acerv60n_init(const machine_t *);
-extern int machine_at_lgibm440fx_init(const machine_t *);
+extern int machine_at_lgibmx61_init(const machine_t *);
 extern int machine_at_vs440fx_init(const machine_t *);
 extern int machine_at_gw2kvenus_init(const machine_t *);
 extern int machine_at_ap440fx_init(const machine_t *);
@@ -731,12 +731,12 @@ extern int machine_at_kn97_init(const machine_t *);
 extern int machine_at_lx6_init(const machine_t *);
 extern int machine_at_spitfire_init(const machine_t *);
 
-extern int machine_at_mate_nx_ma30d_23d_init(const machine_t *);
+extern int machine_at_ma30d_init(const machine_t *);
 
 extern int machine_at_p6i440e2_init(const machine_t *);
 
 extern int machine_at_p2bls_init(const machine_t *);
-extern int machine_at_lgibm440bx_init(const machine_t *);
+extern int machine_at_lgibmx7g_init(const machine_t *);
 extern int machine_at_p3bf_init(const machine_t *);
 extern int machine_at_bf6_init(const machine_t *);
 extern int machine_at_ax6bc_init(const machine_t *);
diff --git a/src/machine/m_at_slot1.c b/src/machine/m_at_slot1.c
index 83e9b74a9..25cbde004 100644
--- a/src/machine/m_at_slot1.c
+++ b/src/machine/m_at_slot1.c
@@ -153,11 +153,11 @@ machine_at_spitfire_init(const machine_t *model)
 }
 
 int
-machine_at_mate_nx_ma30d_23d_init(const machine_t *model)
+machine_at_ma30d_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/mate_nx_ma30d_23d/BIOS.ROM",
+    ret = bios_load_linear("roms/machines/ma30d/BIOS.ROM",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
@@ -261,11 +261,11 @@ machine_at_p2bls_init(const machine_t *model)
 }
 
 int
-machine_at_lgibm440bx_init(const machine_t *model)
+machine_at_lgibmx7g_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/lgibm440bx/ms6119.331",
+    ret = bios_load_linear("roms/machines/lgibmx7g/ms6119.331",
                            0x000c0000, 262144, 0);
 
     if (bios_only || !ret)
diff --git a/src/machine/m_at_socket7.c b/src/machine/m_at_socket7.c
index 46b95ce76..d06129b84 100644
--- a/src/machine/m_at_socket7.c
+++ b/src/machine/m_at_socket7.c
@@ -1211,11 +1211,11 @@ machine_at_ms5146_init(const machine_t *model)
 }
 
 int
-machine_at_cb52x_si_init(const machine_t *model)
+machine_at_cb52xsi_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/cb52x_si/CD5205S.ROM",
+    ret = bios_load_linear("roms/machines/cb52xsi/CD5205S.ROM",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
diff --git a/src/machine/m_at_socket7_3v.c b/src/machine/m_at_socket7_3v.c
index 0e420aa3b..6b3df3c83 100644
--- a/src/machine/m_at_socket7_3v.c
+++ b/src/machine/m_at_socket7_3v.c
@@ -672,15 +672,15 @@ machine_at_p5vxb_init(const machine_t *model)
 }
 
 int
-machine_at_dell_430vx_init(const machine_t *model)
+machine_at_dellhannibalp_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear_combined2("roms/machines/dell_430vx/1003DY0J.BIO",
-                                     "roms/machines/dell_430vx/1003DY0J.BI1",
-                                     "roms/machines/dell_430vx/1003DY0J.BI2",
-                                     "roms/machines/dell_430vx/1003DY0J.BI3",
-                                     "roms/machines/dell_430vx/1003DY0J.RCV",
+    ret = bios_load_linear_combined2("roms/machines/dellhannibalp/1003DY0J.BIO",
+                                     "roms/machines/dellhannibalp/1003DY0J.BI1",
+                                     "roms/machines/dellhannibalp/1003DY0J.BI2",
+                                     "roms/machines/dellhannibalp/1003DY0J.BI3",
+                                     "roms/machines/dellhannibalp/1003DY0J.RCV",
                                      0x3a000, 128);
 
     if (bios_only || !ret)
diff --git a/src/machine/m_at_socket8.c b/src/machine/m_at_socket8.c
index 7ce9d5095..e1dad68e7 100644
--- a/src/machine/m_at_socket8.c
+++ b/src/machine/m_at_socket8.c
@@ -195,11 +195,11 @@ machine_at_acerv60n_init(const machine_t *model)
 }
 
 int
-machine_at_lgibm440fx_init(const machine_t *model)
+machine_at_lgibmx61_init(const machine_t *model)
 {
     int ret;
 
-    ret = bios_load_linear("roms/machines/lgibm440fx/bios.rom",
+    ret = bios_load_linear("roms/machines/lgibmx61/bios.rom",
                            0x000e0000, 131072, 0);
 
     if (bios_only || !ret)
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 06069eed0..ed99ad076 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -9570,10 +9570,10 @@ const machine_t machines[] = {
        Command 0xA0 copyright string: (C)1994 AMI . */
     {
         .name = "[i430VX] Dell Hannibal+",
-        .internal_name = "dell_430vx",
+        .internal_name = "dellhannibalp",
         .type = MACHINE_TYPE_SOCKET7_3V,
         .chipset = MACHINE_CHIPSET_INTEL_430VX,
-        .init = machine_at_dell_430vx_init,
+        .init = machine_at_dellhannibalp_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -11122,10 +11122,10 @@ const machine_t machines[] = {
     /* Has the SiS 5571 chipset with on-chip KBC. */
     {
         .name = "[SiS 5571] Daewoo CB52X-SI",
-        .internal_name = "cb52x_si",
+        .internal_name = "cb52xsi",
         .type = MACHINE_TYPE_SOCKET7,
         .chipset = MACHINE_CHIPSET_SIS_5571,
-        .init = machine_at_cb52x_si_init,
+        .init = machine_at_cb52xsi_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -12024,10 +12024,10 @@ const machine_t machines[] = {
     /* Has the AMIKey-2 (updated 'H') KBC firmware. */
     {
         .name = "[i440FX] LG IBM Multinet x61 (MSI MS-6106)",
-        .internal_name = "lgibm440fx",
+        .internal_name = "lgibmx61",
         .type = MACHINE_TYPE_SOCKET8,
         .chipset = MACHINE_CHIPSET_INTEL_440FX,
-        .init = machine_at_lgibm440fx_init,
+        .init = machine_at_lgibmx61_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -12357,10 +12357,10 @@ const machine_t machines[] = {
        AMIKey-2 KBC firmware. */
     {
         .name = "[i440LX] NEC Mate NX MA30D/23D",
-        .internal_name = "mate_nx_ma30d_23d",
+        .internal_name = "ma30d",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440LX,
-        .init = machine_at_mate_nx_ma30d_23d_init,
+        .init = machine_at_ma30d_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,
@@ -12688,10 +12688,10 @@ const machine_t machines[] = {
     /* Has the AMIKey-2 (updated 'H') KBC firmware. */
     {
         .name = "[i440BX] LG IBM Multinet i x7G (MSI MS-6119)",
-        .internal_name = "lgibm440bx",
+        .internal_name = "lgibmx7g",
         .type = MACHINE_TYPE_SLOT1,
         .chipset = MACHINE_CHIPSET_INTEL_440BX,
-        .init = machine_at_lgibm440bx_init,
+        .init = machine_at_lgibmx7g_init,
         .p1_handler = NULL,
         .gpio_handler = NULL,
         .available_flag = MACHINE_AVAILABLE,