diff --git a/src/device.c b/src/device.c
index 81e19e2dc..12d06580a 100644
--- a/src/device.c
+++ b/src/device.c
@@ -748,7 +748,7 @@ device_is_valid(const device_t *device, int m)
 int
 machine_get_config_int(char *s)
 {
-    const device_t        *d = machine_getdevice(machine);
+    const device_t        *d = machine_get_device(machine);
     const device_config_t *c;
 
     if (d == NULL)
@@ -768,7 +768,7 @@ machine_get_config_int(char *s)
 char *
 machine_get_config_string(char *s)
 {
-    const device_t        *d = machine_getdevice(machine);
+    const device_t        *d = machine_get_device(machine);
     const device_config_t *c;
 
     if (d == NULL)
diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index a6571a1fd..a2417a1bc 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -324,10 +324,10 @@ extern char *machine_get_internal_name(void);
 extern int   machine_get_machine_from_internal_name(char *s);
 extern void  machine_init(void);
 #ifdef EMU_DEVICE_H
-extern const device_t *machine_getdevice(int m);
-extern const device_t *machine_getviddevice(int m);
-extern const device_t *machine_getsnddevice(int m);
-extern const device_t *machine_getnetdevice(int m);
+extern const device_t *machine_get_device(int m);
+extern const device_t *machine_get_vid_device(int m);
+extern const device_t *machine_get_snd_device(int m);
+extern const device_t *machine_get_net_device(int m);
 #endif
 extern char *machine_get_internal_name_ex(int m);
 extern int   machine_get_nvrmask(int m);
diff --git a/src/machine/machine.c b/src/machine/machine.c
index 7a69f4879..893700c7e 100644
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -138,7 +138,7 @@ int
 machine_available(int m)
 {
     int       ret;
-    device_t *d = (device_t *) machine_getdevice(m);
+    device_t *d = (device_t *) machine_get_device(m);
 
     bios_only = 1;
 
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 587e854c9..c489889a3 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -12245,7 +12245,7 @@ machine_getname_ex(int m)
 }
 
 const device_t *
-machine_getdevice(int m)
+machine_get_device(int m)
 {
     if (machines[m].device)
         return (machines[m].device);
@@ -12254,7 +12254,7 @@ machine_getdevice(int m)
 }
 
 const device_t *
-machine_getviddevice(int m)
+machine_get_vid_device(int m)
 {
     if (machines[m].vid_device)
         return (machines[m].vid_device);
@@ -12263,7 +12263,7 @@ machine_getviddevice(int m)
 }
 
 const device_t *
-machine_getsnddevice(int m)
+machine_get_snd_device(int m)
 {
     if (machines[m].snd_device)
         return (machines[m].snd_device);
@@ -12272,7 +12272,7 @@ machine_getsnddevice(int m)
 }
 
 const device_t *
-machine_getnetdevice(int m)
+machine_get_net_device(int m)
 {
     if (machines[m].net_device)
         return (machines[m].net_device);
diff --git a/src/qt/qt_settingsmachine.cpp b/src/qt/qt_settingsmachine.cpp
index b88397e30..e08b07997 100644
--- a/src/qt/qt_settingsmachine.cpp
+++ b/src/qt/qt_settingsmachine.cpp
@@ -169,7 +169,7 @@ SettingsMachine::on_comboBoxMachine_currentIndexChanged(int index)
     }
 
     int         machineId = ui->comboBoxMachine->currentData().toInt();
-    const auto *device    = machine_getdevice(machineId);
+    const auto *device    = machine_get_device(machineId);
     ui->pushButtonConfigure->setEnabled((device != nullptr) && (device->config != nullptr));
 
     auto *modelCpu   = ui->comboBoxCPU->model();
@@ -304,6 +304,6 @@ SettingsMachine::on_pushButtonConfigure_clicked()
 {
     // deviceconfig_inst_open
     int         machineId = ui->comboBoxMachine->currentData().toInt();
-    const auto *device    = machine_getdevice(machineId);
+    const auto *device    = machine_get_device(machineId);
     DeviceConfig::ConfigureDevice(device, 0, qobject_cast<Settings *>(Settings::settings));
 }
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index 37a8aafb0..07822f28b 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -755,7 +755,7 @@ win_settings_machine_recalc_machine(HWND hdlg)
 
     lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
 
-    d = (device_t *) machine_getdevice(temp_machine);
+    d = (device_t *) machine_get_device(temp_machine);
     settings_enable_window(hdlg, IDC_CONFIGURE_MACHINE, d && d->config);
 
     settings_reset_content(hdlg, IDC_COMBO_CPU_TYPE);
@@ -987,7 +987,7 @@ win_settings_machine_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
                     break;
                 case IDC_CONFIGURE_MACHINE:
                     temp_machine = listtomachine[settings_get_cur_sel(hdlg, IDC_COMBO_MACHINE)];
-                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_getdevice(temp_machine));
+                    temp_deviceconfig |= deviceconfig_open(hdlg, (void *) machine_get_device(temp_machine));
                     break;
             }