diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index bfe9324485..e11b713bc4 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -4,8 +4,8 @@ set(LAUNCHER
     main.cpp
     maindialog.cpp
     playpage.cpp
-    unshield_thread.cpp
-    text_slot_msg_box.cpp
+    unshieldthread.cpp
+    textslotmsgbox.cpp
 
     settings/gamesettings.cpp
     settings/graphicssettings.cpp
@@ -22,8 +22,8 @@ set(LAUNCHER_HEADER
     graphicspage.hpp
     maindialog.hpp
     playpage.hpp
-    unshield_thread.hpp
-    text_slot_msg_box.hpp
+    unshieldthread.hpp
+    textslotmsgbox.hpp
 
     settings/gamesettings.hpp
     settings/graphicssettings.hpp
@@ -41,8 +41,8 @@ set(LAUNCHER_HEADER_MOC
     graphicspage.hpp
     maindialog.hpp
     playpage.hpp
-    unshield_thread.hpp
-    text_slot_msg_box.hpp
+    unshieldthread.hpp
+    textslotmsgbox.hpp
 
     utils/checkablemessagebox.hpp
     utils/textinputdialog.hpp
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index e274a28963..857a15196f 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -11,8 +11,8 @@
 
 #include <QDebug>
 
-#include "unshield_thread.hpp"
-#include "text_slot_msg_box.hpp"
+#include "unshieldthread.hpp"
+#include "textslotmsgbox.hpp"
 
 #include "utils/checkablemessagebox.hpp"
 
diff --git a/apps/launcher/text_slot_msg_box.cpp b/apps/launcher/textslotmsgbox.cpp
similarity index 71%
rename from apps/launcher/text_slot_msg_box.cpp
rename to apps/launcher/textslotmsgbox.cpp
index 25bd5d970f..0607d1cc6e 100644
--- a/apps/launcher/text_slot_msg_box.cpp
+++ b/apps/launcher/textslotmsgbox.cpp
@@ -1,4 +1,4 @@
-#include "text_slot_msg_box.hpp"
+#include "textslotmsgbox.hpp"
 
 void TextSlotMsgBox::setTextSlot(const QString& string)
 {
diff --git a/apps/launcher/text_slot_msg_box.hpp b/apps/launcher/textslotmsgbox.hpp
similarity index 100%
rename from apps/launcher/text_slot_msg_box.hpp
rename to apps/launcher/textslotmsgbox.hpp
diff --git a/apps/launcher/unshield_thread.cpp b/apps/launcher/unshieldthread.cpp
similarity index 99%
rename from apps/launcher/unshield_thread.cpp
rename to apps/launcher/unshieldthread.cpp
index 34b6a6d461..2033023883 100644
--- a/apps/launcher/unshield_thread.cpp
+++ b/apps/launcher/unshieldthread.cpp
@@ -1,4 +1,4 @@
-#include "unshield_thread.hpp"
+#include "unshieldthread.hpp"
 
 #include <fstream>
 #include <components/misc/stringops.hpp>
diff --git a/apps/launcher/unshield_thread.hpp b/apps/launcher/unshieldthread.hpp
similarity index 100%
rename from apps/launcher/unshield_thread.hpp
rename to apps/launcher/unshieldthread.hpp