diff --git a/src/bin/system/system.c b/src/bin/system/machine.c
similarity index 99%
rename from src/bin/system/system.c
rename to src/bin/system/machine.c
index 3a3d46f..8f3d55d 100644
--- a/src/bin/system/system.c
+++ b/src/bin/system/machine.c
@@ -73,7 +73,7 @@
 # include <dev/acpica/acpiio.h>
 #endif
 
-#include "system.h"
+#include "machine.h"
 
 #if defined(__OpenBSD__)
 # define CPU_STATES      6
diff --git a/src/bin/system/system.h b/src/bin/system/machine.h
similarity index 96%
rename from src/bin/system/system.h
rename to src/bin/system/machine.h
index ab2693a..7ab71fa 100644
--- a/src/bin/system/system.h
+++ b/src/bin/system/machine.h
@@ -1,5 +1,5 @@
-#ifndef __SYSTEM_H__
-#define __SYSTEM_H__
+#ifndef __MACHINE_H__
+#define __MACHINE_H__
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/bin/system/meson.build b/src/bin/system/meson.build
index 5e87cc9..4587e1b 100644
--- a/src/bin/system/meson.build
+++ b/src/bin/system/meson.build
@@ -3,6 +3,6 @@ src += files([
    'disks.h',
    'process.c',
    'process.h',
-   'system.c',
-   'system.h',
+   'machine.c',
+   'machine.h',
 ])
diff --git a/src/bin/ui/ui_cpu.h b/src/bin/ui/ui_cpu.h
index 663222d..fdb5015 100644
--- a/src/bin/ui/ui_cpu.h
+++ b/src/bin/ui/ui_cpu.h
@@ -2,7 +2,7 @@
 #define __UI_CPU_H__
 
 #include "ui.h"
-#include "../system/system.h"
+#include "../system/machine.h"
 
 void
 ui_tab_cpu_add(Ui *ui);
diff --git a/src/bin/ui/ui_memory.h b/src/bin/ui/ui_memory.h
index 9156668..8b92154 100644
--- a/src/bin/ui/ui_memory.h
+++ b/src/bin/ui/ui_memory.h
@@ -2,7 +2,7 @@
 #define __UI_MEMORY_H__
 
 #include "ui.h"
-#include "../system/system.h"
+#include "../system/machine.h"
 
 void
 ui_tab_memory_add(Ui *ui);
diff --git a/src/bin/ui/ui_misc.h b/src/bin/ui/ui_misc.h
index ca3cb34..82f7628 100644
--- a/src/bin/ui/ui_misc.h
+++ b/src/bin/ui/ui_misc.h
@@ -2,7 +2,7 @@
 #define __UI_MISC_H__
 
 #include "ui.h"
-#include "../system/system.h"
+#include "../system/machine.h"
 
 void
 ui_tab_misc_add(Ui *ui);
diff --git a/src/bin/ui/ui_process.c b/src/bin/ui/ui_process.c
index a6f6881..c52d506 100644
--- a/src/bin/ui/ui_process.c
+++ b/src/bin/ui/ui_process.c
@@ -310,7 +310,7 @@ ui_process_panel_add(Ui *ui)
    elm_entry_line_wrap_set(entry, ELM_WRAP_NONE);
    elm_table_pack(table, entry, 1, i++, 1, 1);
 
-      label = elm_label_add(parent);
+   label = elm_label_add(parent);
    elm_object_text_set(label, _("UID:"));
    evas_object_show(label);
    elm_table_pack(table, label, 0, i, 1, 1);