diff --git a/src/lib/Application.cpp b/src/lib/Application.cpp
index b9765cca..8e7c61e0 100644
--- a/src/lib/Application.cpp
+++ b/src/lib/Application.cpp
@@ -9,7 +9,7 @@
 #include "utility/scheduling/TaskScheduler.h"
 #include "utility/tracing.h"
 #include "utility/UserPaths.h"
-#include "utility/UUIDUtility.h"
+#include "utility/utilityUuid.h"
 #include "utility/Version.h"
 
 #include "component/view/DialogView.h"
@@ -79,7 +79,7 @@ std::string Application::getUUID()
 {
 	if (!s_uuid.size())
 	{
-		s_uuid = UUIDUtility::UUIDtoString(UUIDUtility::getUUID());
+		s_uuid = utility::getUuidString();
 	}
 
 	return s_uuid;
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index ddcd7712..7fec7da0 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -474,10 +474,10 @@ add_files(
 	utility/utilityLibrary.h
 	utility/utilityString.cpp
 	utility/utilityString.h
+	utility/utilityUuid.cpp
+	utility/utilityUuid.h
 	utility/utilityXml.cpp
 	utility/utilityXml.h
-	utility/UUIDUtility.cpp
-	utility/UUIDUtility.h
 	utility/Version.cpp
 	utility/Version.h
 
diff --git a/src/lib/settings/ProjectSettings.cpp b/src/lib/settings/ProjectSettings.cpp
index d4c9225e..7e9c0794 100644
--- a/src/lib/settings/ProjectSettings.cpp
+++ b/src/lib/settings/ProjectSettings.cpp
@@ -7,7 +7,7 @@
 #include "settings/SourceGroupSettingsJava.h"
 #include "utility/utility.h"
 #include "utility/utilityString.h"
-#include "utility/UUIDUtility.h"
+#include "utility/utilityUuid.h"
 
 const size_t ProjectSettings::VERSION = 4;
 const std::string PROJECT_FILE_EXTENSION = ".srctrlprj";
@@ -298,7 +298,7 @@ SettingsMigrator ProjectSettings::getMigrations() const
 		}
 	));
 
-	const std::string sourceGroupKey = "source_groups/source_group_" + UUIDUtility::getUUIDString();
+	const std::string sourceGroupKey = "source_groups/source_group_" + utility::getUuidString();
 
 	migrator.addMigration(2, std::make_shared<MigrationMoveKey>("info/description", "description"));
 	migrator.addMigration(2, std::make_shared<MigrationMoveKey>("language_settings/standard", sourceGroupKey + "/standard"));
diff --git a/src/lib/utility/UUIDUtility.cpp b/src/lib/utility/UUIDUtility.cpp
deleted file mode 100644
index 4b6d3404..00000000
--- a/src/lib/utility/UUIDUtility.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "UUIDUtility.h"
-
-#include <boost/lexical_cast.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
-
-boost::uuids::uuid UUIDUtility::getUUID()
-{
-	return boost::uuids::random_generator()();
-}
-
-std::string UUIDUtility::UUIDtoString(const boost::uuids::uuid& uuid)
-{
-	return boost::lexical_cast<std::string>(uuid);
-}
-
-std::string UUIDUtility::getUUIDString()
-{
-	return UUIDtoString(getUUID());
-}
diff --git a/src/lib/utility/UUIDUtility.h b/src/lib/utility/UUIDUtility.h
deleted file mode 100644
index ebc0f010..00000000
--- a/src/lib/utility/UUIDUtility.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef UUID_UTILITY_H
-#define UUID_UTILITY_H
-
-#include <boost/uuid/uuid.hpp>
-#include <string>
-
-class UUIDUtility
-{
-public:
-	static boost::uuids::uuid getUUID();
-	static std::string UUIDtoString(const boost::uuids::uuid& uuid);
-	static std::string getUUIDString();
-};
-
-#endif // UUID_UTILITY_H
diff --git a/src/lib/utility/utilityUuid.cpp b/src/lib/utility/utilityUuid.cpp
new file mode 100644
index 00000000..4e11f6d0
--- /dev/null
+++ b/src/lib/utility/utilityUuid.cpp
@@ -0,0 +1,20 @@
+#include "utility/utilityUuid.h"
+
+#include <boost/lexical_cast.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>
+
+boost::uuids::uuid utility::getUuid()
+{
+	return boost::uuids::random_generator()();
+}
+
+std::string utility::uuidToString(const boost::uuids::uuid& uuid)
+{
+	return boost::lexical_cast<std::string>(uuid);
+}
+
+std::string utility::getUuidString()
+{
+	return utility::uuidToString(utility::getUuid());
+}
diff --git a/src/lib/utility/utilityUuid.h b/src/lib/utility/utilityUuid.h
new file mode 100644
index 00000000..cba25e3e
--- /dev/null
+++ b/src/lib/utility/utilityUuid.h
@@ -0,0 +1,14 @@
+#ifndef UTILITY_UUID_H
+#define UTILITY_UUID_H
+
+#include <boost/uuid/uuid.hpp>
+#include <string>
+
+namespace utility
+{
+	boost::uuids::uuid getUuid();
+	std::string uuidToString(const boost::uuids::uuid& uuid);
+	std::string getUuidString();
+};
+
+#endif // UTILITY_UUID_H
diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
index 6e211be0..1f4484c7 100644
--- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
+++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzard.cpp
@@ -27,7 +27,7 @@
 #include "utility/utility.h"
 #include "utility/utilityPathDetection.h"
 #include "utility/utilityString.h"
-#include "utility/UUIDUtility.h"
+#include "utility/utilityUuid.h"
 
 #include "Application.h"
 
@@ -95,7 +95,7 @@ void QtProjectWizzard::newProjectFromCDB(const FilePath& filePath, const std::ve
 {
 	m_projectSettings = std::make_shared<ProjectSettings>();
 
-	std::shared_ptr<SourceGroupSettingsCxx> sourceGroupSettings = std::make_shared<SourceGroupSettingsCxx>(UUIDUtility::getUUIDString(), SOURCE_GROUP_CXX_CDB, m_projectSettings.get());
+	std::shared_ptr<SourceGroupSettingsCxx> sourceGroupSettings = std::make_shared<SourceGroupSettingsCxx>(utility::getUuidString(), SOURCE_GROUP_CXX_CDB, m_projectSettings.get());
 	m_projectSettings->setProjectName(filePath.withoutExtension().fileName());
 	m_projectSettings->setProjectFileLocation(filePath.parentDirectory());
 	sourceGroupSettings->setCompilationDatabasePath(filePath);
@@ -261,7 +261,7 @@ void QtProjectWizzard::selectedProjectType(SourceGroupType sourceGroupType)
 {
 	m_projectSettings = std::make_shared<ProjectSettings>();
 
-	const std::string sourceGroupId = UUIDUtility::getUUIDString();
+	const std::string sourceGroupId = utility::getUuidString();
 
 	switch (sourceGroupType)
 	{