diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp
index 76af2806d..fabf38373 100644
--- a/src/calamares/CalamaresApplication.cpp
+++ b/src/calamares/CalamaresApplication.cpp
@@ -20,8 +20,8 @@
 #include "ViewManager.h"
 #include "locale/TranslationsModel.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Gui.h"
+#include "utils/System.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #ifdef WITH_QML
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index ea14175f2..4bd89f5d0 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -19,7 +19,7 @@
 #include "Settings.h"
 #include "ViewManager.h"
 #include "progresstree/ProgressTreeView.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Qml.h"
 #include "utils/Retranslator.h"
diff --git a/src/calamares/DebugWindow.cpp b/src/calamares/DebugWindow.cpp
index 7be761ea1..2e69a9568 100644
--- a/src/calamares/DebugWindow.cpp
+++ b/src/calamares/DebugWindow.cpp
@@ -21,7 +21,7 @@
 #include "VariantModel.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Paste.h"
 #include "utils/Retranslator.h"
diff --git a/src/calamares/progresstree/ProgressTreeDelegate.cpp b/src/calamares/progresstree/ProgressTreeDelegate.cpp
index 3b6ae518c..df513f28b 100644
--- a/src/calamares/progresstree/ProgressTreeDelegate.cpp
+++ b/src/calamares/progresstree/ProgressTreeDelegate.cpp
@@ -14,7 +14,7 @@
 #include "CalamaresApplication.h"
 #include "CalamaresWindow.h"
 #include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QPainter>
 
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 6436da2fc..2a3d9f641 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -77,7 +77,6 @@ add_library(
     partition/PartitionSize.cpp
     partition/Sync.cpp
     # Utility service
-    utils/CalamaresUtilsSystem.cpp
     utils/CommandList.cpp
     utils/Dirs.cpp
     utils/Entropy.cpp
@@ -88,6 +87,7 @@ add_library(
     utils/Runner.cpp
     utils/String.cpp
     utils/StringExpander.cpp
+    utils/System.cpp
     utils/UMask.cpp
     utils/Variant.cpp
     utils/Yaml.cpp
diff --git a/src/libcalamares/ProcessJob.cpp b/src/libcalamares/ProcessJob.cpp
index 1dbc087cf..857078220 100644
--- a/src/libcalamares/ProcessJob.cpp
+++ b/src/libcalamares/ProcessJob.cpp
@@ -10,7 +10,7 @@
 
 #include "ProcessJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>
diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp
index 53f905014..4bae5cdf9 100644
--- a/src/libcalamares/PythonJobApi.cpp
+++ b/src/libcalamares/PythonJobApi.cpp
@@ -15,7 +15,7 @@
 #include "PythonHelper.h"
 #include "locale/Global.h"
 #include "partition/Mount.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 #include "utils/Runner.h"
diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp
index ee4aa4898..1cc30c9f9 100644
--- a/src/libcalamares/partition/Mount.cpp
+++ b/src/libcalamares/partition/Mount.cpp
@@ -12,7 +12,7 @@
 #include "Mount.h"
 
 #include "partition/Sync.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/String.h"
 
diff --git a/src/libcalamares/partition/Sync.cpp b/src/libcalamares/partition/Sync.cpp
index 3ba144a85..9f2a34220 100644
--- a/src/libcalamares/partition/Sync.cpp
+++ b/src/libcalamares/partition/Sync.cpp
@@ -10,7 +10,7 @@
 
 #include "Sync.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 void
diff --git a/src/libcalamares/utils/CommandList.cpp b/src/libcalamares/utils/CommandList.cpp
index a66eb8319..0125e8db2 100644
--- a/src/libcalamares/utils/CommandList.cpp
+++ b/src/libcalamares/utils/CommandList.cpp
@@ -14,7 +14,7 @@
 #include "JobQueue.h"
 
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/StringExpander.h"
 #include "utils/Variant.h"
diff --git a/src/libcalamares/utils/Permissions.cpp b/src/libcalamares/utils/Permissions.cpp
index be50dc63c..f6aad5e37 100644
--- a/src/libcalamares/utils/Permissions.cpp
+++ b/src/libcalamares/utils/Permissions.cpp
@@ -7,7 +7,7 @@
 
 #include "Permissions.h"
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 #include "Logger.h"
 
 #include <QString>
diff --git a/src/libcalamares/utils/Runner.h b/src/libcalamares/utils/Runner.h
index 171b28e76..d6adf3bdd 100644
--- a/src/libcalamares/utils/Runner.h
+++ b/src/libcalamares/utils/Runner.h
@@ -11,7 +11,7 @@
 #ifndef UTILS_RUNNER_H
 #define UTILS_RUNNER_H
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 
 #include <QDir>
 #include <QObject>
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/System.cpp
similarity index 99%
rename from src/libcalamares/utils/CalamaresUtilsSystem.cpp
rename to src/libcalamares/utils/System.cpp
index b5d8535d6..7e5e72dd7 100644
--- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp
+++ b/src/libcalamares/utils/System.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/System.h
similarity index 100%
rename from src/libcalamares/utils/CalamaresUtilsSystem.h
rename to src/libcalamares/utils/System.h
diff --git a/src/libcalamares/utils/TestPaths.cpp b/src/libcalamares/utils/TestPaths.cpp
index d7eb77a99..db1808843 100644
--- a/src/libcalamares/utils/TestPaths.cpp
+++ b/src/libcalamares/utils/TestPaths.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 #include "Entropy.h"
 #include "Logger.h"
 #include "UMask.h"
diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp
index 79629ff6a..fdf7a6f9d 100644
--- a/src/libcalamares/utils/Tests.cpp
+++ b/src/libcalamares/utils/Tests.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include "CalamaresUtilsSystem.h"
+#include "System.h"
 #include "CommandList.h"
 #include "Entropy.h"
 #include "Logger.h"
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index f790a9c62..30062fe5f 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -14,7 +14,7 @@
 #include "Branding.h"
 
 #include "GlobalStorage.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt
index dfa9d5177..a6c31fac4 100644
--- a/src/libcalamaresui/CMakeLists.txt
+++ b/src/libcalamaresui/CMakeLists.txt
@@ -16,7 +16,7 @@ set(calamaresui_SOURCES
     modulesystem/ModuleManager.cpp
     modulesystem/ProcessJobModule.cpp
     modulesystem/ViewModule.cpp
-    utils/CalamaresUtilsGui.cpp
+    utils/Gui.cpp
     utils/ImageRegistry.cpp
     utils/Paste.cpp
     viewpages/BlankViewStep.cpp
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp b/src/libcalamaresui/utils/Gui.cpp
similarity index 99%
rename from src/libcalamaresui/utils/CalamaresUtilsGui.cpp
rename to src/libcalamaresui/utils/Gui.cpp
index d3d520b35..57f67aefc 100644
--- a/src/libcalamaresui/utils/CalamaresUtilsGui.cpp
+++ b/src/libcalamaresui/utils/Gui.cpp
@@ -8,7 +8,7 @@
  *
  */
 
-#include "CalamaresUtilsGui.h"
+#include "Gui.h"
 
 #include "ImageRegistry.h"
 
diff --git a/src/libcalamaresui/utils/CalamaresUtilsGui.h b/src/libcalamaresui/utils/Gui.h
similarity index 100%
rename from src/libcalamaresui/utils/CalamaresUtilsGui.h
rename to src/libcalamaresui/utils/Gui.h
diff --git a/src/libcalamaresui/utils/ImageRegistry.h b/src/libcalamaresui/utils/ImageRegistry.h
index 7e485baa4..0ced78077 100644
--- a/src/libcalamaresui/utils/ImageRegistry.h
+++ b/src/libcalamaresui/utils/ImageRegistry.h
@@ -12,7 +12,7 @@
 #include <QPixmap>
 
 #include "DllMacro.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 class UIDLLEXPORT ImageRegistry
 {
diff --git a/src/libcalamaresui/viewpages/BlankViewStep.cpp b/src/libcalamaresui/viewpages/BlankViewStep.cpp
index c382a8edf..8f101af04 100644
--- a/src/libcalamaresui/viewpages/BlankViewStep.cpp
+++ b/src/libcalamaresui/viewpages/BlankViewStep.cpp
@@ -8,7 +8,7 @@
  */
 #include "BlankViewStep.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QLabel>
 #include <QVBoxLayout>
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
index 0e118cde2..b130ae3f3 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
@@ -21,7 +21,7 @@
 #include "ViewManager.h"
 #include "modulesystem/Module.h"
 #include "modulesystem/ModuleManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Dirs.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
diff --git a/src/libcalamaresui/widgets/PrettyRadioButton.cpp b/src/libcalamaresui/widgets/PrettyRadioButton.cpp
index 62e462a58..404d9c6de 100644
--- a/src/libcalamaresui/widgets/PrettyRadioButton.cpp
+++ b/src/libcalamaresui/widgets/PrettyRadioButton.cpp
@@ -9,7 +9,7 @@
 
 #include "PrettyRadioButton.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "widgets/ClickableLabel.h"
 
 #include <QButtonGroup>
diff --git a/src/libcalamaresui/widgets/WaitingWidget.cpp b/src/libcalamaresui/widgets/WaitingWidget.cpp
index 1024d76ec..7adc00405 100644
--- a/src/libcalamaresui/widgets/WaitingWidget.cpp
+++ b/src/libcalamaresui/widgets/WaitingWidget.cpp
@@ -10,7 +10,7 @@
 
 #include "WaitingWidget.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QBoxLayout>
 #include <QLabel>
diff --git a/src/modules/contextualprocess/Tests.cpp b/src/modules/contextualprocess/Tests.cpp
index 6679eed37..d5a0fde49 100644
--- a/src/modules/contextualprocess/Tests.cpp
+++ b/src/modules/contextualprocess/Tests.cpp
@@ -14,7 +14,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
diff --git a/src/modules/dummycpp/DummyCppJob.cpp b/src/modules/dummycpp/DummyCppJob.cpp
index ab95b1056..483197682 100644
--- a/src/modules/dummycpp/DummyCppJob.cpp
+++ b/src/modules/dummycpp/DummyCppJob.cpp
@@ -19,7 +19,7 @@
 #include "JobQueue.h"
 
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 DummyCppJob::DummyCppJob( QObject* parent )
diff --git a/src/modules/hostinfo/HostInfoJob.cpp b/src/modules/hostinfo/HostInfoJob.cpp
index 300c4cabd..7b11c2c7d 100644
--- a/src/modules/hostinfo/HostInfoJob.cpp
+++ b/src/modules/hostinfo/HostInfoJob.cpp
@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 
diff --git a/src/modules/initcpio/InitcpioJob.cpp b/src/modules/initcpio/InitcpioJob.cpp
index 39e9a8bc5..18c49ffd3 100644
--- a/src/modules/initcpio/InitcpioJob.cpp
+++ b/src/modules/initcpio/InitcpioJob.cpp
@@ -10,7 +10,7 @@
 
 #include "InitcpioJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/UMask.h"
 #include "utils/Variant.h"
diff --git a/src/modules/initramfs/InitramfsJob.cpp b/src/modules/initramfs/InitramfsJob.cpp
index aa4eec097..5683775d7 100644
--- a/src/modules/initramfs/InitramfsJob.cpp
+++ b/src/modules/initramfs/InitramfsJob.cpp
@@ -9,7 +9,7 @@
 
 #include "InitramfsJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/UMask.h"
 #include "utils/Variant.h"
diff --git a/src/modules/initramfs/Tests.cpp b/src/modules/initramfs/Tests.cpp
index 6f9639db7..44cff8b29 100644
--- a/src/modules/initramfs/Tests.cpp
+++ b/src/modules/initramfs/Tests.cpp
@@ -13,7 +13,7 @@
 #include "JobQueue.h"
 #include "Settings.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
diff --git a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
index 63ab722a1..46bc6d831 100644
--- a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
+++ b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp
@@ -9,7 +9,7 @@
 
 #include "InteractiveTerminalPage.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "viewpages/ViewStep.h"
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 30833a893..1337b7543 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -19,7 +19,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/String.h"
 
diff --git a/src/modules/license/LicensePage.cpp b/src/modules/license/LicensePage.cpp
index df035adfb..4331c1371 100644
--- a/src/modules/license/LicensePage.cpp
+++ b/src/modules/license/LicensePage.cpp
@@ -19,7 +19,7 @@
 #include "JobQueue.h"
 #include "ViewManager.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Retranslator.h"
diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 48ce27782..dadaf7fd9 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -14,7 +14,7 @@
 #include "LCLocaleDialog.h"
 #include "timezonewidget/timezonewidget.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 #include "utils/Retranslator.h"
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index c2183e3ab..3d069e72b 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -17,7 +17,7 @@
 
 #include "geoip/Handler.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 #include "utils/Yaml.h"
diff --git a/src/modules/locale/SetTimezoneJob.cpp b/src/modules/locale/SetTimezoneJob.cpp
index 075a4db96..e91307e3a 100644
--- a/src/modules/locale/SetTimezoneJob.cpp
+++ b/src/modules/locale/SetTimezoneJob.cpp
@@ -13,7 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>
diff --git a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
index 59167532a..6c68b4b53 100644
--- a/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
+++ b/src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp
@@ -7,7 +7,7 @@
 
 #include "LuksBootKeyFileJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Entropy.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
index 6a54074cb..86103ecc6 100644
--- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp
+++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp
@@ -10,7 +10,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 #include "utils/PluginFactory.h"
diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp
index ae2a407a9..fe5d58583 100644
--- a/src/modules/luksopenswaphookcfg/Tests.cpp
+++ b/src/modules/luksopenswaphookcfg/Tests.cpp
@@ -10,7 +10,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QtTest/QtTest>
diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp
index 7114391a9..a86105d9a 100644
--- a/src/modules/machineid/MachineIdJob.cpp
+++ b/src/modules/machineid/MachineIdJob.cpp
@@ -13,7 +13,7 @@
 #include "MachineIdJob.h"
 #include "Workers.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/machineid/Tests.cpp b/src/modules/machineid/Tests.cpp
index 14c358c87..d30dd8c10 100644
--- a/src/modules/machineid/Tests.cpp
+++ b/src/modules/machineid/Tests.cpp
@@ -12,7 +12,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>
diff --git a/src/modules/machineid/Workers.cpp b/src/modules/machineid/Workers.cpp
index 2e8776f43..44a488e0a 100644
--- a/src/modules/machineid/Workers.cpp
+++ b/src/modules/machineid/Workers.cpp
@@ -12,7 +12,7 @@
 
 #include "Workers.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Entropy.h"
 #include "utils/Logger.h"
 
diff --git a/src/modules/notesqml/NotesQmlViewStep.h b/src/modules/notesqml/NotesQmlViewStep.h
index 337378086..71ea31326 100644
--- a/src/modules/notesqml/NotesQmlViewStep.h
+++ b/src/modules/notesqml/NotesQmlViewStep.h
@@ -11,7 +11,7 @@
 
 #include "DllMacro.h"
 #include "locale/TranslatableConfiguration.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/PluginFactory.h"
 #include "utils/Variant.h"
 #include "viewpages/QmlViewStep.h"
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index eeffbfe12..44a570d2f 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -11,7 +11,7 @@
 
 #include "ui_page_package.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index e3b27df5c..89b226879 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -16,7 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "locale/TranslatableConfiguration.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
index ae4aa3c48..15b0d87a2 100644
--- a/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
+++ b/src/modules/packagechooserq/PackageChooserQmlViewStep.cpp
@@ -13,7 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "locale/TranslatableConfiguration.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp
index 2ce46378c..01dd7098b 100644
--- a/src/modules/partition/PartitionViewStep.cpp
+++ b/src/modules/partition/PartitionViewStep.cpp
@@ -25,7 +25,7 @@
 #include "Branding.h"
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index ceaa94af6..531db660f 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -11,7 +11,7 @@
 #include "DeviceList.h"
 
 #include "partition/PartitionIterator.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <kpmcore/backend/corebackend.h>
diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp
index 06029eac2..160cc7ba7 100644
--- a/src/modules/partition/core/DeviceModel.cpp
+++ b/src/modules/partition/core/DeviceModel.cpp
@@ -13,7 +13,7 @@
 #include "core/PartitionModel.h"
 #include "core/SizeUtils.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 
 // KPMcore
diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 9bf78933b..5cbe392e8 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -20,7 +20,7 @@
 #include "partition/Mount.h"
 #include "partition/PartitionIterator.h"
 #include "partition/PartitionQuery.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/RAII.h"
 
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index a17ca79dd..3e4558691 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -18,7 +18,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Units.h"
diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp
index b62328d2e..b4339be9a 100644
--- a/src/modules/partition/gui/BootInfoWidget.cpp
+++ b/src/modules/partition/gui/BootInfoWidget.cpp
@@ -10,7 +10,7 @@
 #include "BootInfoWidget.h"
 #include "core/PartUtils.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 310a1dce3..313eda2ed 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -36,7 +36,7 @@
 #include "JobQueue.h"
 #include "partition/PartitionIterator.h"
 #include "partition/PartitionQuery.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/Units.h"
diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index f9af6e32c..f57ed91d3 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
diff --git a/src/modules/partition/gui/EncryptWidget.cpp b/src/modules/partition/gui/EncryptWidget.cpp
index 9c085ce2c..cd0062e4d 100644
--- a/src/modules/partition/gui/EncryptWidget.cpp
+++ b/src/modules/partition/gui/EncryptWidget.cpp
@@ -14,7 +14,7 @@
 #include "ui_EncryptWidget.h"
 
 #include "Branding.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Retranslator.h"
 
 constexpr int ZFS_MIN_LENGTH = 8;
diff --git a/src/modules/partition/gui/PartitionBarsView.cpp b/src/modules/partition/gui/PartitionBarsView.cpp
index fd331a9af..ef748d262 100644
--- a/src/modules/partition/gui/PartitionBarsView.cpp
+++ b/src/modules/partition/gui/PartitionBarsView.cpp
@@ -12,7 +12,7 @@
 #include "core/ColorUtils.h"
 #include "core/PartitionModel.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 
 #include <kpmcore/core/device.h>
diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp
index d44ebb105..4dfaae140 100644
--- a/src/modules/partition/gui/PartitionLabelsView.cpp
+++ b/src/modules/partition/gui/PartitionLabelsView.cpp
@@ -14,7 +14,7 @@
 #include "core/PartitionModel.h"
 #include "core/SizeUtils.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 
diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp
index 898475d40..9fef8e348 100644
--- a/src/modules/partition/gui/PartitionSplitterWidget.cpp
+++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp
@@ -16,7 +16,7 @@
 #include "partition/PartitionQuery.h"
 #include "utils/Logger.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp
index 1ac9daf27..c985c9a25 100644
--- a/src/modules/partition/jobs/CreatePartitionJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionJob.cpp
@@ -16,7 +16,7 @@
 
 #include "partition/FileSystem.h"
 #include "partition/PartitionQuery.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 
diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
index 5de0ed1ea..77b164d88 100644
--- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp
+++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp
@@ -12,7 +12,7 @@
 #include "CreatePartitionTableJob.h"
 
 #include "partition/PartitionIterator.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include "core/KPMHelpers.h"
diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp
index 7411abfe0..2903ecf85 100644
--- a/src/modules/partition/jobs/DeletePartitionJob.cpp
+++ b/src/modules/partition/jobs/DeletePartitionJob.cpp
@@ -13,7 +13,7 @@
 
 #include "core/KPMHelpers.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp
index 45a644234..8b4cfaf92 100644
--- a/src/modules/partition/jobs/FormatPartitionJob.cpp
+++ b/src/modules/partition/jobs/FormatPartitionJob.cpp
@@ -14,7 +14,7 @@
 #include "core/KPMHelpers.h"
 
 #include "partition/FileSystem.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <kpmcore/core/device.h>
diff --git a/src/modules/plasmalnf/Config.cpp b/src/modules/plasmalnf/Config.cpp
index 4922dceaa..f2f13356c 100644
--- a/src/modules/plasmalnf/Config.cpp
+++ b/src/modules/plasmalnf/Config.cpp
@@ -12,7 +12,7 @@
 #include "PlasmaLnfJob.h"
 #include "ThemeInfo.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/plasmalnf/PlasmaLnfJob.cpp b/src/modules/plasmalnf/PlasmaLnfJob.cpp
index 9c0449e86..b11acdf52 100644
--- a/src/modules/plasmalnf/PlasmaLnfJob.cpp
+++ b/src/modules/plasmalnf/PlasmaLnfJob.cpp
@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #ifdef WITH_KCONFIG
diff --git a/src/modules/plasmalnf/ThemeInfo.cpp b/src/modules/plasmalnf/ThemeInfo.cpp
index 7678bb151..96a960040 100644
--- a/src/modules/plasmalnf/ThemeInfo.cpp
+++ b/src/modules/plasmalnf/ThemeInfo.cpp
@@ -9,7 +9,7 @@
 #include "ThemeInfo.h"
 
 #include "Branding.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 
 #include <KPackage/Package>
diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp
index d1f163583..960669ade 100644
--- a/src/modules/preservefiles/Item.cpp
+++ b/src/modules/preservefiles/Item.cpp
@@ -10,7 +10,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 #include "utils/Variant.h"
diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp
index 6ab061741..b65a273b7 100644
--- a/src/modules/preservefiles/PreserveFiles.cpp
+++ b/src/modules/preservefiles/PreserveFiles.cpp
@@ -13,7 +13,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "compat/Variant.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
 #include "utils/StringExpander.h"
diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp
index a47da5415..81cd81d9c 100644
--- a/src/modules/preservefiles/Tests.cpp
+++ b/src/modules/preservefiles/Tests.cpp
@@ -10,7 +10,7 @@
 #include "Item.h"
 
 #include "Settings.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Yaml.h"
diff --git a/src/modules/removeuser/RemoveUserJob.cpp b/src/modules/removeuser/RemoveUserJob.cpp
index bb70305f5..8f5dfcda4 100644
--- a/src/modules/removeuser/RemoveUserJob.cpp
+++ b/src/modules/removeuser/RemoveUserJob.cpp
@@ -13,7 +13,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/summary/Config.cpp b/src/modules/summary/Config.cpp
index 6eddfa3f7..75fed6817 100644
--- a/src/modules/summary/Config.cpp
+++ b/src/modules/summary/Config.cpp
@@ -13,7 +13,7 @@
 #include "Branding.h"
 #include "Settings.h"
 #include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "viewpages/ExecutionViewStep.h"
diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index a66710822..41881e479 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -17,7 +17,7 @@
 #include "Settings.h"
 #include "ViewManager.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp
index e764750b8..82e54d381 100644
--- a/src/modules/tracking/TrackingJobs.cpp
+++ b/src/modules/tracking/TrackingJobs.cpp
@@ -14,7 +14,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <KMacroExpander>
diff --git a/src/modules/tracking/TrackingPage.cpp b/src/modules/tracking/TrackingPage.cpp
index a5fb3ccc6..df4b52385 100644
--- a/src/modules/tracking/TrackingPage.cpp
+++ b/src/modules/tracking/TrackingPage.cpp
@@ -16,7 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "ViewManager.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 
diff --git a/src/modules/tracking/TrackingViewStep.cpp b/src/modules/tracking/TrackingViewStep.cpp
index 7955846c3..8498d6de8 100644
--- a/src/modules/tracking/TrackingViewStep.cpp
+++ b/src/modules/tracking/TrackingViewStep.cpp
@@ -16,7 +16,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/umount/Tests.cpp b/src/modules/umount/Tests.cpp
index dc0198619..fc1d3d666 100644
--- a/src/modules/umount/Tests.cpp
+++ b/src/modules/umount/Tests.cpp
@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDir>
diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp
index b7d879bd8..c40353809 100644
--- a/src/modules/umount/UmountJob.cpp
+++ b/src/modules/umount/UmountJob.cpp
@@ -15,7 +15,7 @@
 #include "UmountJob.h"
 
 #include "partition/Mount.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
 
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index 94f51b5cd..50e4e92e0 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -11,7 +11,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 
diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index 740901808..9a3fedeec 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -14,7 +14,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 
diff --git a/src/modules/users/SetHostNameJob.cpp b/src/modules/users/SetHostNameJob.cpp
index f09bba6ed..38cc91f63 100644
--- a/src/modules/users/SetHostNameJob.cpp
+++ b/src/modules/users/SetHostNameJob.cpp
@@ -13,7 +13,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 
 #include <QDBusConnection>
diff --git a/src/modules/users/SetPasswordJob.cpp b/src/modules/users/SetPasswordJob.cpp
index 64db318f2..630cf1168 100644
--- a/src/modules/users/SetPasswordJob.cpp
+++ b/src/modules/users/SetPasswordJob.cpp
@@ -12,7 +12,7 @@
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Entropy.h"
 #include "utils/Logger.h"
 
diff --git a/src/modules/users/TestSetHostNameJob.cpp b/src/modules/users/TestSetHostNameJob.cpp
index edf8d134c..f3974973b 100644
--- a/src/modules/users/TestSetHostNameJob.cpp
+++ b/src/modules/users/TestSetHostNameJob.cpp
@@ -16,7 +16,7 @@ extern bool setSystemdHostname( const QString& );
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
diff --git a/src/modules/users/UsersPage.cpp b/src/modules/users/UsersPage.cpp
index 6e370852d..bac30f350 100644
--- a/src/modules/users/UsersPage.cpp
+++ b/src/modules/users/UsersPage.cpp
@@ -22,7 +22,7 @@
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/String.h"
diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp
index a0532aac4..0b7d005a6 100644
--- a/src/modules/welcome/Tests.cpp
+++ b/src/modules/welcome/Tests.cpp
@@ -12,7 +12,7 @@
 #include "Branding.h"
 #include "Settings.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Yaml.h"
 
diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
index 71cb13792..d0ca70444 100644
--- a/src/modules/welcome/WelcomePage.cpp
+++ b/src/modules/welcome/WelcomePage.cpp
@@ -23,7 +23,7 @@
 
 #include "modulesystem/ModuleManager.h"
 #include "modulesystem/RequirementsModel.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
 #include "utils/Retranslator.h"
diff --git a/src/modules/welcome/checker/CheckerContainer.cpp b/src/modules/welcome/checker/CheckerContainer.cpp
index 2062471df..4e1ad6db5 100644
--- a/src/modules/welcome/checker/CheckerContainer.cpp
+++ b/src/modules/welcome/checker/CheckerContainer.cpp
@@ -15,7 +15,7 @@
 
 #include "ResultsListWidget.h"
 
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "widgets/WaitingWidget.h"
diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp
index aa1fb805b..8805f7c86 100644
--- a/src/modules/welcome/checker/GeneralRequirements.cpp
+++ b/src/modules/welcome/checker/GeneralRequirements.cpp
@@ -22,8 +22,8 @@
 #include "compat/Variant.h"
 #include "modulesystem/Requirement.h"
 #include "network/Manager.h"
-#include "utils/CalamaresUtilsGui.h"
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Gui.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/Units.h"
diff --git a/src/modules/welcome/checker/ResultDelegate.cpp b/src/modules/welcome/checker/ResultDelegate.cpp
index 7844153be..060febbb5 100644
--- a/src/modules/welcome/checker/ResultDelegate.cpp
+++ b/src/modules/welcome/checker/ResultDelegate.cpp
@@ -10,7 +10,7 @@
 #include "ResultDelegate.h"
 
 #include "modulesystem/RequirementsModel.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 
 #include <QApplication>
 #include <QPainter>
diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index af88cc9cf..3f70c61ee 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -14,7 +14,7 @@
 
 #include "Branding.h"
 #include "Settings.h"
-#include "utils/CalamaresUtilsGui.h"
+#include "utils/Gui.h"
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "widgets/FixedAspectRatioLabel.h"
diff --git a/src/modules/zfs/ZfsJob.cpp b/src/modules/zfs/ZfsJob.cpp
index 9203da721..ccfa94f56 100644
--- a/src/modules/zfs/ZfsJob.cpp
+++ b/src/modules/zfs/ZfsJob.cpp
@@ -9,7 +9,7 @@
 
 #include "ZfsJob.h"
 
-#include "utils/CalamaresUtilsSystem.h"
+#include "utils/System.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"