diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 982a9b4c2..11ea9eaca 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 #include "modulesystem/Module.h"
 
 #include "GlobalStorage.h"
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 2814b02a0..bd42ba5c5 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -28,7 +28,7 @@ set( utilsSources
     utils/PluginFactory.cpp
     utils/Retranslator.cpp
     utils/Variant.cpp
-    utils/YamlUtils.cpp
+    utils/Yaml.cpp
 )
 set( kdsagSources
     kdsingleapplicationguard/kdsingleapplicationguard.cpp
diff --git a/src/libcalamares/GlobalStorage.cpp b/src/libcalamares/GlobalStorage.cpp
index 54331eb3e..73236a311 100644
--- a/src/libcalamares/GlobalStorage.cpp
+++ b/src/libcalamares/GlobalStorage.cpp
@@ -21,7 +21,7 @@
 #include "JobQueue.h"
 
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QFile>
 #include <QJsonDocument>
diff --git a/src/libcalamares/Settings.cpp b/src/libcalamares/Settings.cpp
index 74b99c417..1ba58ccdf 100644
--- a/src/libcalamares/Settings.cpp
+++ b/src/libcalamares/Settings.cpp
@@ -23,7 +23,7 @@
 
 #include "utils/CalamaresUtils.h"
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QDir>
 #include <QFile>
diff --git a/src/libcalamares/Tests.cpp b/src/libcalamares/Tests.cpp
index e8566887d..615cb51a7 100644
--- a/src/libcalamares/Tests.cpp
+++ b/src/libcalamares/Tests.cpp
@@ -19,7 +19,7 @@
 #include "Tests.h"
 
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QtTest/QtTest>
 
diff --git a/src/libcalamares/utils/YamlUtils.cpp b/src/libcalamares/utils/Yaml.cpp
similarity index 99%
rename from src/libcalamares/utils/YamlUtils.cpp
rename to src/libcalamares/utils/Yaml.cpp
index b60978919..aa7ef6c2e 100644
--- a/src/libcalamares/utils/YamlUtils.cpp
+++ b/src/libcalamares/utils/Yaml.cpp
@@ -16,7 +16,7 @@
  *   You should have received a copy of the GNU General Public License
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
-#include "YamlUtils.h"
+#include "Yaml.h"
 
 #include "utils/Logger.h"
 
diff --git a/src/libcalamares/utils/YamlUtils.h b/src/libcalamares/utils/Yaml.h
similarity index 97%
rename from src/libcalamares/utils/YamlUtils.h
rename to src/libcalamares/utils/Yaml.h
index 68268efdf..8755be336 100644
--- a/src/libcalamares/utils/YamlUtils.h
+++ b/src/libcalamares/utils/Yaml.h
@@ -17,8 +17,8 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef YAMLUTILS_H
-#define YAMLUTILS_H
+#ifndef UTILS_YAML_H
+#define UTILS_YAML_H
 
 #include <QStringList>
 #include <QVariant>
@@ -77,6 +77,6 @@ void explainYamlException( const YAML::Exception& e, const QByteArray& data, con
 void explainYamlException( const YAML::Exception& e, const QByteArray& data, const QString& label );
 void explainYamlException( const YAML::Exception& e, const QByteArray& data );
 
-} //ns
+}  // namespace
 
-#endif // YAMLUTILS_H
+#endif
diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp
index 22248ae53..e3da98614 100644
--- a/src/libcalamaresui/Branding.cpp
+++ b/src/libcalamaresui/Branding.cpp
@@ -26,7 +26,7 @@
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QDir>
 #include <QFile>
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index 97833edb2..de2cb79a5 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -23,7 +23,7 @@
 #include "CppJobModule.h"
 #include "ViewModule.h"
 #include "utils/CalamaresUtils.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 #include "utils/Logger.h"
 #include "Settings.h"
 #include "CalamaresConfig.h"
diff --git a/src/libcalamaresui/modulesystem/ModuleManager.cpp b/src/libcalamaresui/modulesystem/ModuleManager.cpp
index d2aa3f5c8..32fe09033 100644
--- a/src/libcalamaresui/modulesystem/ModuleManager.cpp
+++ b/src/libcalamaresui/modulesystem/ModuleManager.cpp
@@ -26,7 +26,7 @@
 #include "ViewManager.h"
 
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QApplication>
 #include <QDir>
diff --git a/src/modules/contextualprocess/Tests.cpp b/src/modules/contextualprocess/Tests.cpp
index 055e35c53..51319c220 100644
--- a/src/modules/contextualprocess/Tests.cpp
+++ b/src/modules/contextualprocess/Tests.cpp
@@ -20,7 +20,7 @@
 #include "ContextualProcessJob.h"
 
 #include "utils/CommandList.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QtTest/QtTest>
 
diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp
index 3c204327a..190a1d279 100644
--- a/src/modules/fsresizer/Tests.cpp
+++ b/src/modules/fsresizer/Tests.cpp
@@ -23,7 +23,7 @@
 #include "Settings.h"
 
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QtTest/QtTest>
 
diff --git a/src/modules/locale/GeoIPJSON.cpp b/src/modules/locale/GeoIPJSON.cpp
index 81e0ff0e7..8e5cc2e5c 100644
--- a/src/modules/locale/GeoIPJSON.cpp
+++ b/src/modules/locale/GeoIPJSON.cpp
@@ -21,7 +21,7 @@
 
 #include "utils/Logger.h"
 #include "utils/Variant.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QByteArray>
 
diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp
index c432f84d6..d321b8501 100644
--- a/src/modules/locale/LocaleViewStep.cpp
+++ b/src/modules/locale/LocaleViewStep.cpp
@@ -34,7 +34,7 @@
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/Variant.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QBoxLayout>
 #include <QLabel>
diff --git a/src/modules/netinstall/NetInstallPage.cpp b/src/modules/netinstall/NetInstallPage.cpp
index 607251488..dfa94744d 100644
--- a/src/modules/netinstall/NetInstallPage.cpp
+++ b/src/modules/netinstall/NetInstallPage.cpp
@@ -28,7 +28,7 @@
 
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QNetworkAccessManager>
 #include <QNetworkRequest>
diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index 588646816..2fde7695e 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -19,7 +19,7 @@
 
 #include "PackageModel.h"
 
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 PackageModel::PackageModel( const YAML::Node& data, QObject* parent ) :
     QAbstractItemModel( parent ),
diff --git a/src/modules/shellprocess/Tests.cpp b/src/modules/shellprocess/Tests.cpp
index 3672586f0..488f4a7af 100644
--- a/src/modules/shellprocess/Tests.cpp
+++ b/src/modules/shellprocess/Tests.cpp
@@ -24,7 +24,7 @@
 
 #include "utils/CommandList.h"
 #include "utils/Logger.h"
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <QtTest/QtTest>
 
diff --git a/src/modules/test_conf.cpp b/src/modules/test_conf.cpp
index d0746421f..06247bfed 100644
--- a/src/modules/test_conf.cpp
+++ b/src/modules/test_conf.cpp
@@ -21,7 +21,7 @@
  * shipped with each module for correctness -- well, for parseability.
  */
 
-#include "utils/YamlUtils.h"
+#include "utils/Yaml.h"
 
 #include <unistd.h>
 #include <stdlib.h>