diff --git a/src/apps/deskflow-gui/MainWindow.cpp b/src/apps/deskflow-gui/MainWindow.cpp
index 46da1675a..ae4b2f8ec 100644
--- a/src/apps/deskflow-gui/MainWindow.cpp
+++ b/src/apps/deskflow-gui/MainWindow.cpp
@@ -19,9 +19,9 @@
 #include "gui/Constants.h"
 #include "gui/Diagnostic.h"
 #include "gui/Logger.h"
+#include "gui/Messages.h"
 #include "gui/core/CoreProcess.h"
 #include "gui/ipc/DaemonIpcClient.h"
-#include "gui/messages.h"
 #include "gui/string_utils.h"
 #include "gui/style_utils.h"
 #include "gui/styles.h"
diff --git a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
index b6d99fd1c..a961d3de9 100644
--- a/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
+++ b/src/apps/deskflow-gui/dialogs/SettingsDialog.cpp
@@ -10,8 +10,8 @@
 #include "ui_SettingsDialog.h"
 
 #include "common/Settings.h"
+#include "gui/Messages.h"
 #include "gui/core/CoreProcess.h"
-#include "gui/messages.h"
 #include "gui/tls/TlsCertificate.h"
 #include "gui/tls/TlsUtility.h"
 
diff --git a/src/apps/deskflow-gui/main.cpp b/src/apps/deskflow-gui/main.cpp
index b381caa02..73adf0d3e 100644
--- a/src/apps/deskflow-gui/main.cpp
+++ b/src/apps/deskflow-gui/main.cpp
@@ -12,7 +12,7 @@
 #include "gui/Diagnostic.h"
 #include "gui/DotEnv.h"
 #include "gui/Logger.h"
-#include "gui/messages.h"
+#include "gui/Messages.h"
 #include "gui/string_utils.h"
 #include "gui/style_utils.h"
 
diff --git a/src/lib/gui/CMakeLists.txt b/src/lib/gui/CMakeLists.txt
index 5ac412516..b6a127a65 100644
--- a/src/lib/gui/CMakeLists.txt
+++ b/src/lib/gui/CMakeLists.txt
@@ -25,8 +25,8 @@ add_library(${target} STATIC
   FileTail.h
   Logger.cpp
   Logger.h
-  messages.cpp
-  messages.h
+  Messages.cpp
+  Messages.h
   string_utils.h
   style_utils.h
   styles.h
diff --git a/src/lib/gui/messages.cpp b/src/lib/gui/Messages.cpp
similarity index 99%
rename from src/lib/gui/messages.cpp
rename to src/lib/gui/Messages.cpp
index 300eb8e71..df3d6830f 100644
--- a/src/lib/gui/messages.cpp
+++ b/src/lib/gui/Messages.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
  */
 
-#include "messages.h"
+#include "Messages.h"
 
 #include "Constants.h"
 #include "EnvVars.h"
diff --git a/src/lib/gui/messages.h b/src/lib/gui/Messages.h
similarity index 100%
rename from src/lib/gui/messages.h
rename to src/lib/gui/Messages.h
diff --git a/src/lib/gui/core/ClientConnection.cpp b/src/lib/gui/core/ClientConnection.cpp
index 1758494c9..b07f9fcad 100644
--- a/src/lib/gui/core/ClientConnection.cpp
+++ b/src/lib/gui/core/ClientConnection.cpp
@@ -6,8 +6,8 @@
 
 #include "ClientConnection.h"
 
+#include "Messages.h"
 #include "common/Settings.h"
-#include "messages.h"
 
 #include <QHostAddress>
 #include <QMessageBox>
diff --git a/src/lib/gui/core/ClientConnection.h b/src/lib/gui/core/ClientConnection.h
index a36c7e967..42b049788 100644
--- a/src/lib/gui/core/ClientConnection.h
+++ b/src/lib/gui/core/ClientConnection.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "gui/messages.h"
+#include "gui/Messages.h"
 
 #include <QObject>
 #include <QString>
diff --git a/src/lib/gui/core/ServerConnection.cpp b/src/lib/gui/core/ServerConnection.cpp
index 06b627cd5..4529c4f25 100644
--- a/src/lib/gui/core/ServerConnection.cpp
+++ b/src/lib/gui/core/ServerConnection.cpp
@@ -10,7 +10,7 @@
 
 #include "common/Settings.h"
 
-#include "messages.h"
+#include "Messages.h"
 
 #include <QMessageBox>
 #include <QPushButton>
diff --git a/src/lib/gui/core/ServerConnection.h b/src/lib/gui/core/ServerConnection.h
index 9d6c9257d..220b01077 100644
--- a/src/lib/gui/core/ServerConnection.h
+++ b/src/lib/gui/core/ServerConnection.h
@@ -9,8 +9,8 @@
 #include <QString>
 #include <QStringList>
 
+#include "gui/Messages.h"
 #include "gui/config/IServerConfig.h"
-#include "gui/messages.h"
 
 namespace deskflow::gui {
 
diff --git a/src/lib/gui/core/WaylandWarnings.cpp b/src/lib/gui/core/WaylandWarnings.cpp
index 5ab2ae17e..a7c6c3c4c 100644
--- a/src/lib/gui/core/WaylandWarnings.cpp
+++ b/src/lib/gui/core/WaylandWarnings.cpp
@@ -6,8 +6,8 @@
 
 #include "WaylandWarnings.h"
 
+#include "Messages.h"
 #include "common/Settings.h"
-#include "messages.h"
 
 using namespace deskflow::platform;