diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5be4d54fdf82e48698263bda9572fe43c4490d3f..f9a655bba44eda315c1d58f6d1dda68e25069ec8 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -114,7 +114,22 @@
         "forward_list": "cpp",
         "cfenv": "cpp",
         "qaspectengine": "cpp",
-        "qorbitcameracontroller": "cpp"
+        "qorbitcameracontroller": "cpp",
+        "*.ui": "cpp",
+        "qpoint": "cpp",
+        "qfiledialog": "cpp",
+        "qlineedit": "cpp",
+        "qdir": "cpp",
+        "typeindex": "cpp",
+        "qtime": "cpp",
+        "qaction": "cpp",
+        "qhboxlayout": "cpp",
+        "qserialportinfo": "cpp",
+        "qfile": "cpp",
+        "qgridlayout": "cpp",
+        "qboxlayout": "cpp",
+        "qtextstream": "cpp",
+        "qcolordialog": "cpp"
     },
     "editor.defaultFormatter": "ms-vscode.cpptools",
     "[xml]": {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 078a34d5fad97e7a82f0d962990545dfb84e1b49..10e3c7db2d54686da6e1129b4ab412e28f3bf73c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,61 +39,61 @@ find_package(Qt5 REQUIRED COMPONENTS
 )
 
 add_executable(groundstation
-    src/shared/Components/ContextMenuSeparator/contextmenuseparator.cpp
-    src/shared/Components/ModulesPicker/modulespicker.cpp
-    src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.cpp
-    src/shared/Components/SubscriptionsPanel/subscriptionspanel.cpp
-    src/shared/Components/ToggleButton/togglebutton.cpp
-    src/shared/Components/ErrorDisplayer/error.cpp
-    src/shared/Components/ErrorDisplayer/errordisplayer.cpp
-    src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.cpp
-    src/shared/Components/TopicFilterSelector/topicfilterselector.cpp
-    src/shared/Core/Message/messagefield.cpp
-    src/shared/Core/Message/modulemessage.cpp
-    src/shared/Core/Message/topic.cpp
-    src/shared/Core/Message/topicandfieldfilter.cpp
-    src/shared/Core/Message/topicfilter.cpp
+    src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.cpp
+    src/shared/Components/ModulesPicker/ModulesPicker.cpp
+    src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.cpp
+    src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.cpp
+    src/shared/Components/ToggleButton/ToggleButton.cpp
+    src/shared/Components/ErrorDisplayer/Error.cpp
+    src/shared/Components/ErrorDisplayer/ErrorDisplayer.cpp
+    src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.cpp
+    src/shared/Components/TopicFilterSelector/TopicFilterSelector.cpp
+    src/shared/Core/Message/MessageField.cpp
+    src/shared/Core/Message/ModuleMessage.cpp
+    src/shared/Core/Message/Topic.cpp
+    src/shared/Core/Message/TopicAndFieldFilter.cpp
+    src/shared/Core/Message/TopicFilter.cpp
     src/shared/Core/QCustomPlot/QCustomPlot.cpp
-    src/shared/Core/module.cpp
-    src/shared/Core/moduleeventshandler.cpp
-    src/shared/Core/modulemessagesbroker.cpp
-    src/shared/Core/modulesmanager.cpp
-    src/shared/Core/skywardhubcore.cpp
-    src/shared/Core/xmlobject.cpp
+    src/shared/Core/Module.cpp
+    src/shared/Core/ModuleEventsHandler.cpp
+    src/shared/Core/ModuleMessagesBroker.cpp
+    src/shared/Core/ModulesManager.cpp
+    src/shared/Core/SkywardHubCore.cpp
+    src/shared/Core/XmlObject.cpp
     src/shared/Modules/CommandPad/CommandPad.cpp
     src/shared/Modules/CommandPad/MessageFormElement.cpp
     src/shared/Modules/CompactCommandPad/CompactCommandPad.cpp
     src/shared/Modules/CompactCommandPad/CommandSelector.cpp
     src/shared/Modules/CompactCommandPad/SendThread.cpp
-    src/shared/Modules/DefaultModule/defaultmodule.cpp
-    src/shared/Modules/Empty/emptymodule.cpp
-    src/shared/Modules/FileStream/filestreammodule.cpp
+    src/shared/Modules/DefaultModule/DefaultModule.cpp
+    src/shared/Modules/Empty/EmptyModule.cpp
+    src/shared/Modules/FileStream/FileStreamModule.cpp
     src/shared/Modules/Graph/Graph.cpp
-    src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.cpp
-    src/shared/Modules/MainWindow/skywardhubmainwindow.cpp
-    src/shared/Modules/MainWindow/window.cpp
-    src/shared/Modules/Mavlink/mavlinkcommandadapter.cpp
-    src/shared/Modules/Mavlink/mavlinkmodule.cpp
-    src/shared/Modules/Mavlink/mavlinkreader.cpp
-    src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp
-    src/shared/Modules/Mavlink/mavlinkwriter.cpp
-    src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp
-    src/shared/Modules/SkywardHub/deployer.cpp
-    src/shared/Modules/SkywardHub/deployerpathpicker.cpp
-    src/shared/Modules/SkywardHub/prefabdialog.cpp
-    src/shared/Modules/SkywardHub/prefabviewelement.cpp
-    src/shared/Modules/SkywardHub/skywardhubmodule.cpp
+    src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.cpp
+    src/shared/Modules/MainWindow/SkywardHubMainWindow.cpp
+    src/shared/Modules/MainWindow/Window.cpp
+    src/shared/Modules/Mavlink/MavlinkCommandAdapter.cpp
+    src/shared/Modules/Mavlink/MavlinkModule.cpp
+    src/shared/Modules/Mavlink/MavlinkReader.cpp
+    src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.cpp
+    src/shared/Modules/Mavlink/MavlinkWriter.cpp
+    src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
+    src/shared/Modules/SkywardHub/Deployer.cpp
+    src/shared/Modules/SkywardHub/DeployerPathPicker.cpp
+    src/shared/Modules/SkywardHub/PrefabDialog.cpp
+    src/shared/Modules/SkywardHub/PrefabViewElement.cpp
+    src/shared/Modules/SkywardHub/SkywardHubModule.cpp
     src/shared/Modules/Splitter/Splitter.cpp
     src/shared/Modules/OrientationVisualizer/OrientationVisualizer.cpp
     src/shared/Modules/StateViewer/StateViewer.cpp
-    src/shared/Modules/Tabs/tabsmodule.cpp
-    src/shared/Modules/Test/testmodule.cpp
-    src/shared/Modules/TimerController/timercontrollermodule.cpp
-    src/shared/Modules/ValuesConverterViewer/valueelement.cpp
-    src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp
-    src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp
-    src/shared/Modules/moduleinfo.cpp
-    src/shared/Modules/moduleslist.cpp
+    src/shared/Modules/Tabs/TabsModule.cpp
+    src/shared/Modules/Test/TestModule.cpp
+    src/shared/Modules/TimerController/TimerControllerModule.cpp
+    src/shared/Modules/ValuesConverterViewer/ValueElement.cpp
+    src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.cpp
+    src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.cpp
+    src/shared/Modules/ModuleInfo.cpp
+    src/shared/Modules/ModulesList.cpp
     src/entrypoints/groundstation/application.qrc
     src/entrypoints/groundstation/main.cpp
 )
diff --git a/src/entrypoints/groundstation/main.cpp b/src/entrypoints/groundstation/main.cpp
index 3a9bbd43c54c6d25da1701e8d99959bb4388de92..7adc02c85b241f21ffd54ed5df7eccaeb832e990 100644
--- a/src/entrypoints/groundstation/main.cpp
+++ b/src/entrypoints/groundstation/main.cpp
@@ -1,6 +1,6 @@
 #include <QApplication>
 
-#include "Modules/MainWindow/skywardhubmainwindow.h"
+#include "Modules/MainWindow/SkywardHubMainWindow.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/src/shared/Components/ContextMenuSeparator/contextmenuseparator.cpp b/src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.cpp
similarity index 95%
rename from src/shared/Components/ContextMenuSeparator/contextmenuseparator.cpp
rename to src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.cpp
index 466a9722e532bc5f2093cf02946a666c8f23ede4..3e1085a16ab293daf8469d2d69a4b2bd71fb185e 100644
--- a/src/shared/Components/ContextMenuSeparator/contextmenuseparator.cpp
+++ b/src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.cpp
@@ -1,4 +1,4 @@
-#include "contextmenuseparator.h"
+#include "ContextMenuSeparator.h"
 
 ContextMenuSeparator::ContextMenuSeparator(QWidget *parent)
     : QWidgetAction(parent)
diff --git a/src/shared/Components/ContextMenuSeparator/contextmenuseparator.h b/src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.h
similarity index 81%
rename from src/shared/Components/ContextMenuSeparator/contextmenuseparator.h
rename to src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.h
index 66f93e53ca1031a3457e35a3d9fd148e7bd264f8..9c7fa69c4680307210688206b6524c81efc03f3e 100644
--- a/src/shared/Components/ContextMenuSeparator/contextmenuseparator.h
+++ b/src/shared/Components/ContextMenuSeparator/ContextMenuSeparator.h
@@ -1,5 +1,4 @@
-#ifndef CONTEXTMENUSEPARATOR_H
-#define CONTEXTMENUSEPARATOR_H
+#pragma once
 
 #include <QLabel>
 #include <QWidgetAction>
@@ -20,5 +19,3 @@ protected:
 private:
     QLabel label;
 };
-
-#endif  // CONTEXTMENUSEPARATOR_H
diff --git a/src/shared/Components/ErrorDisplayer/error.cpp b/src/shared/Components/ErrorDisplayer/Error.cpp
similarity index 98%
rename from src/shared/Components/ErrorDisplayer/error.cpp
rename to src/shared/Components/ErrorDisplayer/Error.cpp
index a7dd6445df9a3728e0b28b3beb3b75eada681313..75ade719fd68b868b740bfb71b5fb48eb08dc87c 100644
--- a/src/shared/Components/ErrorDisplayer/error.cpp
+++ b/src/shared/Components/ErrorDisplayer/Error.cpp
@@ -1,8 +1,8 @@
-#include "error.h"
+#include "Error.h"
 
 #include <QDebug>
 
-#include "errordisplayer.h"
+#include "ErrorDisplayer.h"
 
 Error::Error(ErrorDisplayer* _displayer, QString _title, QString _description,
              ErrorType _type, int msecDuration)
diff --git a/src/shared/Components/ErrorDisplayer/error.h b/src/shared/Components/ErrorDisplayer/Error.h
similarity index 83%
rename from src/shared/Components/ErrorDisplayer/error.h
rename to src/shared/Components/ErrorDisplayer/Error.h
index 16a0571abd6d54b9077155db84bc9c5828b7a276..085c88d712eba0f9bf1309382060e9470b59d509 100644
--- a/src/shared/Components/ErrorDisplayer/error.h
+++ b/src/shared/Components/ErrorDisplayer/Error.h
@@ -1,5 +1,4 @@
-#ifndef ERROR_H
-#define ERROR_H
+#pragma once
 
 #include <QGridLayout>
 #include <QLabel>
@@ -9,9 +8,9 @@
 #include <QWidget>
 #include <QtWidgets>
 
-#include "Core/Message/modulemessage.h"
-#include "Core/modulemessagesbroker.h"
-#include "Core/skywardhubcore.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Core/ModuleMessagesBroker.h"
+#include "Core/SkywardHubCore.h"
 
 enum ErrorType
 {
@@ -48,5 +47,3 @@ private:
     ErrorType type;
     int count;
 };
-
-#endif  // ERROR_H
diff --git a/src/shared/Components/ErrorDisplayer/errordisplayer.cpp b/src/shared/Components/ErrorDisplayer/ErrorDisplayer.cpp
similarity index 97%
rename from src/shared/Components/ErrorDisplayer/errordisplayer.cpp
rename to src/shared/Components/ErrorDisplayer/ErrorDisplayer.cpp
index f2d499eaadffc3119dfd6a1b6a494504097ce5fb..39a5669f3d23069938511836568ef8a8269a16e1 100644
--- a/src/shared/Components/ErrorDisplayer/errordisplayer.cpp
+++ b/src/shared/Components/ErrorDisplayer/ErrorDisplayer.cpp
@@ -1,4 +1,4 @@
-#include "errordisplayer.h"
+#include "ErrorDisplayer.h"
 
 #include <QDebug>
 
diff --git a/src/shared/Components/ErrorDisplayer/errordisplayer.h b/src/shared/Components/ErrorDisplayer/ErrorDisplayer.h
similarity index 85%
rename from src/shared/Components/ErrorDisplayer/errordisplayer.h
rename to src/shared/Components/ErrorDisplayer/ErrorDisplayer.h
index 6324f1c8ef531ed774a34b4fc85bbf9b91c6a1da..8f65b7f6430f53d72062c33c61f3eba47eaa91c4 100644
--- a/src/shared/Components/ErrorDisplayer/errordisplayer.h
+++ b/src/shared/Components/ErrorDisplayer/ErrorDisplayer.h
@@ -1,5 +1,4 @@
-#ifndef ERRORDISPLAYER_H
-#define ERRORDISPLAYER_H
+#pragma once
 
 #include <QGridLayout>
 #include <QLabel>
@@ -10,7 +9,7 @@
 #include <QWidget>
 #include <QtWidgets>
 
-#include "error.h"
+#include "Error.h"
 
 class ErrorDisplayer : public QWidget
 {
@@ -34,5 +33,3 @@ private:
     QVBoxLayout layout;
     QList<Error*> errors;
 };
-
-#endif  // ERRORDISPLAYER_H
diff --git a/src/shared/Components/ModulesPicker/modulespicker.cpp b/src/shared/Components/ModulesPicker/ModulesPicker.cpp
similarity index 97%
rename from src/shared/Components/ModulesPicker/modulespicker.cpp
rename to src/shared/Components/ModulesPicker/ModulesPicker.cpp
index 3ade6c0d69b00284352da7053b517e1466eaf021..61c1fc93b8da0c41641df272f2f18396f710f71a 100644
--- a/src/shared/Components/ModulesPicker/modulespicker.cpp
+++ b/src/shared/Components/ModulesPicker/ModulesPicker.cpp
@@ -1,12 +1,12 @@
-#include "modulespicker.h"
+#include "ModulesPicker.h"
 
 #include <Modules/Splitter/Splitter.h>
 
 #include <QDebug>
 #include <QPushButton>
 
-#include "Core/modulesmanager.h"
-#include "ui_modulespicker.h"
+#include "Core/ModulesManager.h"
+#include "ui_ModulesPicker.h"
 
 ModulesPicker::ModulesPicker() : QDialog(), ui(new Ui::ModulesPicker)
 {
diff --git a/src/shared/Components/ModulesPicker/modulespicker.h b/src/shared/Components/ModulesPicker/ModulesPicker.h
similarity index 90%
rename from src/shared/Components/ModulesPicker/modulespicker.h
rename to src/shared/Components/ModulesPicker/ModulesPicker.h
index 53c3ee59fdbc6e329bf24f54f94238d731ff4888..ad65edfd53add5f3dbd0494acd839c32dd27dde9 100644
--- a/src/shared/Components/ModulesPicker/modulespicker.h
+++ b/src/shared/Components/ModulesPicker/ModulesPicker.h
@@ -1,7 +1,6 @@
-#ifndef MODULESPICKER_H
-#define MODULESPICKER_H
+#pragma once
 
-#include <Core/module.h>
+#include <Core/Module.h>
 
 #include <QDialog>
 #include <QPushButton>
@@ -45,5 +44,3 @@ private:
     Ui::ModulesPicker* ui;
     Module** selectedModule = nullptr;
 };
-
-#endif  // MODULESPICKER_H
diff --git a/src/shared/Components/ModulesPicker/modulespicker.ui b/src/shared/Components/ModulesPicker/ModulesPicker.ui
similarity index 100%
rename from src/shared/Components/ModulesPicker/modulespicker.ui
rename to src/shared/Components/ModulesPicker/ModulesPicker.ui
diff --git a/src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.cpp b/src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.cpp
similarity index 96%
rename from src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.cpp
rename to src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.cpp
index fe051627936212bb7490910720f728c06b99edb3..8c51e3c6aa45cc5c3adf4e1ad4640b9aa0da646b 100644
--- a/src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.cpp
+++ b/src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.cpp
@@ -1,8 +1,8 @@
-#include "saveconfigurationdialog.h"
+#include "SaveConfigurationDialog.h"
 
 #include <QFileDialog>
 
-#include "ui_saveconfigurationdialog.h"
+#include "ui_SaveConfigurationDialog.h"
 
 SaveConfigurationDialog::SaveConfigurationDialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::SaveConfigurationDialog)
diff --git a/src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.h b/src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.h
similarity index 88%
rename from src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.h
rename to src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.h
index b2f7433f008bd0c857a16fe8f214c12c80ce019a..1b261b2990c5c0b8f1ab9a3cb162dc1d99f80a4f 100644
--- a/src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.h
+++ b/src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.h
@@ -1,5 +1,4 @@
-#ifndef SAVECONFIGURATIONDIALOG_H
-#define SAVECONFIGURATIONDIALOG_H
+#pragma once
 
 #include <QDialog>
 
@@ -33,5 +32,3 @@ private:
     Ui::SaveConfigurationDialog *ui;
     QString *name = nullptr, *iconPath = nullptr, *description = nullptr;
 };
-
-#endif  // SAVECONFIGURATIONDIALOG_H
diff --git a/src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.ui b/src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.ui
similarity index 100%
rename from src/shared/Components/SaveConfigurationDialog/saveconfigurationdialog.ui
rename to src/shared/Components/SaveConfigurationDialog/SaveConfigurationDialog.ui
diff --git a/src/shared/Components/SubscriptionsPanel/subscriptionspanel.cpp b/src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.cpp
similarity index 94%
rename from src/shared/Components/SubscriptionsPanel/subscriptionspanel.cpp
rename to src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.cpp
index 4db9d323fc6ed90086d3af0a73f6f04a66aface1..42ca6d6c79abec1460003e8e22148e719d75e871 100644
--- a/src/shared/Components/SubscriptionsPanel/subscriptionspanel.cpp
+++ b/src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.cpp
@@ -1,10 +1,10 @@
-#include "subscriptionspanel.h"
+#include "SubscriptionsPanel.h"
 
 #include <QDebug>
 #include <functional>
 
-#include "Components/TopicFilterSelector/topicfilterselector.h"
-#include "ui_subscriptionspanel.h"
+#include "Components/TopicFilterSelector/TopicFilterSelector.h"
+#include "ui_SubscriptionsPanel.h"
 
 using namespace std;
 
diff --git a/src/shared/Components/SubscriptionsPanel/subscriptionspanel.h b/src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.h
similarity index 84%
rename from src/shared/Components/SubscriptionsPanel/subscriptionspanel.h
rename to src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.h
index 44be8d54a72e8892b719e0507b4e990beeaba0eb..cc0407294cd11b3aa02c1db9167c17f94e0f3911 100644
--- a/src/shared/Components/SubscriptionsPanel/subscriptionspanel.h
+++ b/src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.h
@@ -1,11 +1,10 @@
-#ifndef SUBSCRIPTIONSPANEL_H
-#define SUBSCRIPTIONSPANEL_H
+#pragma once
 
 #include <QList>
 #include <QListWidgetItem>
 #include <QWidget>
 
-#include "Core/Message/topicandfieldfilter.h"
+#include "Core/Message/TopicAndFieldFilter.h"
 
 namespace Ui
 {
@@ -36,5 +35,3 @@ signals:
 private:
     Ui::SubscriptionsPanel* ui;
 };
-
-#endif  // SUBSCRIPTIONSPANEL_H
diff --git a/src/shared/Components/SubscriptionsPanel/subscriptionspanel.ui b/src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.ui
similarity index 100%
rename from src/shared/Components/SubscriptionsPanel/subscriptionspanel.ui
rename to src/shared/Components/SubscriptionsPanel/SubscriptionsPanel.ui
diff --git a/src/shared/Components/ToggleButton/togglebutton.cpp b/src/shared/Components/ToggleButton/ToggleButton.cpp
similarity index 99%
rename from src/shared/Components/ToggleButton/togglebutton.cpp
rename to src/shared/Components/ToggleButton/ToggleButton.cpp
index bd29a3e8d409059289a7db412e41592c18f24948..2e0d8597c12f26900b3c8bdd846e72a071cbbbb6 100644
--- a/src/shared/Components/ToggleButton/togglebutton.cpp
+++ b/src/shared/Components/ToggleButton/ToggleButton.cpp
@@ -1,4 +1,4 @@
-#include "togglebutton.h"
+#include "ToggleButton.h"
 
 ToggleButton::ToggleButton(QWidget* parent)
     : QAbstractButton(parent), _switch(false), _opacity(0.000), _height(16),
diff --git a/src/shared/Components/ToggleButton/togglebutton.h b/src/shared/Components/ToggleButton/ToggleButton.h
similarity index 93%
rename from src/shared/Components/ToggleButton/togglebutton.h
rename to src/shared/Components/ToggleButton/ToggleButton.h
index 339bd2ee6b97538e8be1b5a5c03fe345bd965426..47a6b3f27aadef6b79fc1357c1ee7fd0ef95d86c 100644
--- a/src/shared/Components/ToggleButton/togglebutton.h
+++ b/src/shared/Components/ToggleButton/ToggleButton.h
@@ -1,5 +1,4 @@
-#ifndef TOGGLEBUTTON_H
-#define TOGGLEBUTTON_H
+#pragma once
 
 #include <QAbstractButton>
 #include <QtWidgets>
@@ -47,5 +46,3 @@ private:
     QBrush _thumb, _track, _brush;
     QPropertyAnimation* _anim = nullptr;
 };
-
-#endif  // TOGGLEBUTTON_H
diff --git a/src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.cpp b/src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.cpp
similarity index 98%
rename from src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.cpp
rename to src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.cpp
index 5c0365982f913b32ceaf430ecb741fb105049f9a..880074ea0591a46f2a1df3e2419236ecc44e89dc 100644
--- a/src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.cpp
+++ b/src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.cpp
@@ -1,5 +1,5 @@
 
-#include "topicandfieldfilterselector.h"
+#include "TopicAndFieldFilterSelector.h"
 
 #include <QFormLayout>
 #include <QLineEdit>
diff --git a/src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.h b/src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.h
similarity index 76%
rename from src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.h
rename to src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.h
index 5bfdc5535e1932b8b516f486b5050b8446898fac..5e1c0e7301a77392d8c299db2a1b1ade6c67736c 100644
--- a/src/shared/Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.h
+++ b/src/shared/Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.h
@@ -1,12 +1,11 @@
-#ifndef TOPICANDFIELDFILTERSELECTOR_H
-#define TOPICANDFIELDFILTERSELECTOR_H
+#pragma once
 
 #include <QPair>
 #include <QString>
 #include <QWidget>
 #include <functional>
 
-#include "Core/Message/topicandfieldfilter.h"
+#include "Core/Message/TopicAndFieldFilter.h"
 
 class TopicAndFieldFilterSelector : public QWidget
 {
@@ -25,5 +24,3 @@ private:
 signals:
     void filterSelected(const TopicAndFieldFilter&);
 };
-
-#endif  // TOPICANDFIELDFILTERSELECTOR_H
diff --git a/src/shared/Components/TopicFilterSelector/topicfilterselector.cpp b/src/shared/Components/TopicFilterSelector/TopicFilterSelector.cpp
similarity index 98%
rename from src/shared/Components/TopicFilterSelector/topicfilterselector.cpp
rename to src/shared/Components/TopicFilterSelector/TopicFilterSelector.cpp
index 4b4aae6c4573ec281358dfbfaf7c2740476dd70f..643a7b6a7c928b173966b622e9bbf0d1f032b676 100644
--- a/src/shared/Components/TopicFilterSelector/topicfilterselector.cpp
+++ b/src/shared/Components/TopicFilterSelector/TopicFilterSelector.cpp
@@ -1,4 +1,4 @@
-#include "topicfilterselector.h"
+#include "TopicFilterSelector.h"
 
 #include <QFormLayout>
 #include <QLineEdit>
diff --git a/src/shared/Components/TopicFilterSelector/topicfilterselector.h b/src/shared/Components/TopicFilterSelector/TopicFilterSelector.h
similarity index 76%
rename from src/shared/Components/TopicFilterSelector/topicfilterselector.h
rename to src/shared/Components/TopicFilterSelector/TopicFilterSelector.h
index 577c82069eee76814ceecab12aabf61f780111d4..158eb722d14b918614f47c965769ec88eb92d463 100644
--- a/src/shared/Components/TopicFilterSelector/topicfilterselector.h
+++ b/src/shared/Components/TopicFilterSelector/TopicFilterSelector.h
@@ -1,12 +1,11 @@
-#ifndef TOPICFILTERSELECTOR_H
-#define TOPICFILTERSELECTOR_H
+#pragma once
 
 #include <QPair>
 #include <QString>
 #include <QWidget>
 #include <functional>
 
-#include "Core/Message/topicfilter.h"
+#include "Core/Message/TopicFilter.h"
 
 class TopicFilterSelector : public QWidget
 {
@@ -24,5 +23,3 @@ private:
 signals:
     void filterSelected(const TopicFilter&);
 };
-
-#endif  // TOPICANDFIELDFILTERSELECTOR_H
diff --git a/src/shared/Core/Message/messagefield.cpp b/src/shared/Core/Message/MessageField.cpp
similarity index 99%
rename from src/shared/Core/Message/messagefield.cpp
rename to src/shared/Core/Message/MessageField.cpp
index f16193491d2807c074a16a188e2fbc1542f470a8..4be8bb4e6828d613ebcfd0d3ee9c0f1c421251b2 100644
--- a/src/shared/Core/Message/messagefield.cpp
+++ b/src/shared/Core/Message/MessageField.cpp
@@ -1,4 +1,4 @@
-#include "messagefield.h"
+#include "MessageField.h"
 
 MessageField::MessageField() : type(Type::EMPTY) {}
 
diff --git a/src/shared/Core/Message/messagefield.h b/src/shared/Core/Message/MessageField.h
similarity index 95%
rename from src/shared/Core/Message/messagefield.h
rename to src/shared/Core/Message/MessageField.h
index edc82a13359d811597212bb582f111f653f5b8d7..cf5497dc16cddf91e261df1db16242ebac04a59c 100644
--- a/src/shared/Core/Message/messagefield.h
+++ b/src/shared/Core/Message/MessageField.h
@@ -1,5 +1,4 @@
-#ifndef MESSAGEFIELD_H
-#define MESSAGEFIELD_H
+#pragma once
 
 #include <QList>
 #include <QString>
@@ -65,5 +64,3 @@ private:
         char c;
     };
 };
-
-#endif  // MESSAGEFIELD_H
diff --git a/src/shared/Core/Message/modulemessage.cpp b/src/shared/Core/Message/ModuleMessage.cpp
similarity index 98%
rename from src/shared/Core/Message/modulemessage.cpp
rename to src/shared/Core/Message/ModuleMessage.cpp
index 1280c52e2bd2f72cccce2e6dca9cb6f1f5064913..cbb1d9ebe75d3f18fe5635d5e1a86f58dc8f81f3 100644
--- a/src/shared/Core/Message/modulemessage.cpp
+++ b/src/shared/Core/Message/ModuleMessage.cpp
@@ -1,4 +1,4 @@
-#include "modulemessage.h"
+#include "ModuleMessage.h"
 
 ModuleMessage::ModuleMessage() {}
 
diff --git a/src/shared/Core/Message/modulemessage.h b/src/shared/Core/Message/ModuleMessage.h
similarity index 88%
rename from src/shared/Core/Message/modulemessage.h
rename to src/shared/Core/Message/ModuleMessage.h
index c35f98c413d9cecdc6918a3d7b7fcc84cbbc7c2e..19209574391b2cd0f98ea2be8c1183e4a8ef3aef 100644
--- a/src/shared/Core/Message/modulemessage.h
+++ b/src/shared/Core/Message/ModuleMessage.h
@@ -1,11 +1,10 @@
-#ifndef MODULEMESSAGE_H
-#define MODULEMESSAGE_H
+#pragma once
 
 #include <QMap>
 #include <QTime>
 
-#include "messagefield.h"
-#include "topic.h"
+#include "MessageField.h"
+#include "Topic.h"
 
 /*
  * Structure of internal GS Messages.
@@ -42,5 +41,3 @@ private:
     Topic topic;
     QMap<QString, MessageField> fields;
 };
-
-#endif  // MODULEMESSAGE_H
diff --git a/src/shared/Core/Message/topic.cpp b/src/shared/Core/Message/Topic.cpp
similarity index 97%
rename from src/shared/Core/Message/topic.cpp
rename to src/shared/Core/Message/Topic.cpp
index 820ff406f00df6eb9ede6bae817e2150e4dee81f..cbae6d08531aeaaab47a8cbc78c3209b8640bfc6 100644
--- a/src/shared/Core/Message/topic.cpp
+++ b/src/shared/Core/Message/Topic.cpp
@@ -1,4 +1,4 @@
-#include "topic.h"
+#include "Topic.h"
 
 #include <QRegExp>
 
diff --git a/src/shared/Core/Message/topic.h b/src/shared/Core/Message/Topic.h
similarity index 100%
rename from src/shared/Core/Message/topic.h
rename to src/shared/Core/Message/Topic.h
diff --git a/src/shared/Core/Message/topicandfieldfilter.cpp b/src/shared/Core/Message/TopicAndFieldFilter.cpp
similarity index 98%
rename from src/shared/Core/Message/topicandfieldfilter.cpp
rename to src/shared/Core/Message/TopicAndFieldFilter.cpp
index ac0d44647477e2b9f145dec826b82b61e2e337d5..fb6929f72fa196d53e8c84a7e407086423508f84 100644
--- a/src/shared/Core/Message/topicandfieldfilter.cpp
+++ b/src/shared/Core/Message/TopicAndFieldFilter.cpp
@@ -1,4 +1,4 @@
-#include "topicandfieldfilter.h"
+#include "TopicAndFieldFilter.h"
 
 TopicAndFieldFilter::TopicAndFieldFilter()
     : topicFilter(TopicFilter::any()), fieldFilter("")
diff --git a/src/shared/Core/Message/topicandfieldfilter.h b/src/shared/Core/Message/TopicAndFieldFilter.h
similarity index 89%
rename from src/shared/Core/Message/topicandfieldfilter.h
rename to src/shared/Core/Message/TopicAndFieldFilter.h
index 3d710ea40bd65f8e51752962ba7e79fb1b098171..a93a7b9272bf2238f2eac2e3d14cc784ad710b7c 100644
--- a/src/shared/Core/Message/topicandfieldfilter.h
+++ b/src/shared/Core/Message/TopicAndFieldFilter.h
@@ -1,9 +1,8 @@
-#ifndef TOPICANDFIELDFILTER_H
-#define TOPICANDFIELDFILTER_H
+#pragma once
 
-#include "messagefield.h"
-#include "modulemessage.h"
-#include "topicfilter.h"
+#include "MessageField.h"
+#include "ModuleMessage.h"
+#include "TopicFilter.h"
 
 /**
  * @brief Represents an expressions that can match against topics and fields.
@@ -54,5 +53,3 @@ private:
     TopicFilter topicFilter;
     QString fieldFilter;
 };
-
-#endif  // TOPICANDFIELDFILTER_H
diff --git a/src/shared/Core/Message/topicfilter.cpp b/src/shared/Core/Message/TopicFilter.cpp
similarity index 98%
rename from src/shared/Core/Message/topicfilter.cpp
rename to src/shared/Core/Message/TopicFilter.cpp
index 313cf56c648df3acf0653e7b29932fb4a7e7c9af..4331bea8548c5c05f5fde0eb7883f97f9618b726 100644
--- a/src/shared/Core/Message/topicfilter.cpp
+++ b/src/shared/Core/Message/TopicFilter.cpp
@@ -1,4 +1,4 @@
-#include "topicfilter.h"
+#include "TopicFilter.h"
 
 TopicFilter::TopicFilter(const QString& expression)
 {
diff --git a/src/shared/Core/Message/topicfilter.h b/src/shared/Core/Message/TopicFilter.h
similarity index 98%
rename from src/shared/Core/Message/topicfilter.h
rename to src/shared/Core/Message/TopicFilter.h
index 32c67c9f108885ed16c667d6ed1e95e45e044632..2b18425020cd1ab47e4ea8a32e8d606bcf24bf30 100644
--- a/src/shared/Core/Message/topicfilter.h
+++ b/src/shared/Core/Message/TopicFilter.h
@@ -3,7 +3,7 @@
 #include <QRegularExpression>
 #include <QString>
 
-#include "topic.h"
+#include "Topic.h"
 
 /**
  * @brief Represents expressions that can match against message topics.
diff --git a/src/shared/Core/module.cpp b/src/shared/Core/Module.cpp
similarity index 90%
rename from src/shared/Core/module.cpp
rename to src/shared/Core/Module.cpp
index ce1ef9a7422026eba3335a5dc9d12b82b792170b..9fbfc96d736537d4be94d37d6d72155e9476a346 100644
--- a/src/shared/Core/module.cpp
+++ b/src/shared/Core/Module.cpp
@@ -1,4 +1,4 @@
-#include "module.h"
+#include "Module.h"
 
 Module::Module(QWidget *parent) : QWidget(parent) {}
 
diff --git a/src/shared/Core/module.h b/src/shared/Core/Module.h
similarity index 80%
rename from src/shared/Core/module.h
rename to src/shared/Core/Module.h
index 7c4dd91d484534c9ab6dd177b3414c5c3ef0a09b..9c76e7e23acb375b9954cbdca04fba2627a188f5 100644
--- a/src/shared/Core/module.h
+++ b/src/shared/Core/Module.h
@@ -1,11 +1,10 @@
-#ifndef MODULE_H
-#define MODULE_H
+#pragma once
 
 #include <QWidget>
 
-#include "Core/xmlobject.h"
-#include "moduleeventshandler.h"
-#include "skywardhubcore.h"
+#include "Core/XmlObject.h"
+#include "ModuleEventsHandler.h"
+#include "SkywardHubCore.h"
 
 class Module : public QWidget
 {
@@ -29,4 +28,3 @@ private:
     SkywardHubCoreProxy coreProxy;
     ModuleEventsHandler eventsHandler;
 };
-#endif  // MODULE_H
diff --git a/src/shared/Core/moduleeventshandler.cpp b/src/shared/Core/ModuleEventsHandler.cpp
similarity index 58%
rename from src/shared/Core/moduleeventshandler.cpp
rename to src/shared/Core/ModuleEventsHandler.cpp
index d10a072740c327d78b26a992e8884883bddd847b..173b89eaf3ada0ff7d90d8c4d1bf741e6affcde7 100644
--- a/src/shared/Core/moduleeventshandler.cpp
+++ b/src/shared/Core/ModuleEventsHandler.cpp
@@ -1,3 +1,3 @@
-#include "moduleeventshandler.h"
+#include "ModuleEventsHandler.h"
 
 ModuleEventsHandler::ModuleEventsHandler() {}
diff --git a/src/shared/Core/moduleeventshandler.h b/src/shared/Core/ModuleEventsHandler.h
similarity index 79%
rename from src/shared/Core/moduleeventshandler.h
rename to src/shared/Core/ModuleEventsHandler.h
index 87fdc30c1ef36b3827b4036dda26448c32541ce5..ea2242625a4c714724e9bb23b5d22d77f1db1c37 100644
--- a/src/shared/Core/moduleeventshandler.h
+++ b/src/shared/Core/ModuleEventsHandler.h
@@ -1,5 +1,4 @@
-#ifndef MODULEEVENTSHANDLER_H
-#define MODULEEVENTSHANDLER_H
+#pragma once
 
 #include <QMenu>
 #include <QObject>
@@ -18,5 +17,3 @@ signals:
     void replaceMeWithModules(QList<Module *> module);
     void contextMenuRequest(QMenu &menu, const QPoint &p);
 };
-
-#endif  // MODULEEVENTSHANDLER_H
diff --git a/src/shared/Core/modulemessagesbroker.cpp b/src/shared/Core/ModuleMessagesBroker.cpp
similarity index 95%
rename from src/shared/Core/modulemessagesbroker.cpp
rename to src/shared/Core/ModuleMessagesBroker.cpp
index 0d7e62538f7e6e5470ebb4f2eec3c14bdb4f6428..3fdc4bff0dba76f6310091768960c35db0022e0d 100644
--- a/src/shared/Core/modulemessagesbroker.cpp
+++ b/src/shared/Core/ModuleMessagesBroker.cpp
@@ -1,10 +1,8 @@
-#include "modulemessagesbroker.h"
+#include "ModuleMessagesBroker.h"
 
 #include <QDebug>
 
-#include "module.h"
-
-// ModuleMessagesBroker *ModuleMessagesBroker::modulesMsgBroker = nullptr;
+#include "Module.h"
 
 ModuleMessagesBroker::ModuleMessagesBroker() {}
 
diff --git a/src/shared/Core/modulemessagesbroker.h b/src/shared/Core/ModuleMessagesBroker.h
similarity index 83%
rename from src/shared/Core/modulemessagesbroker.h
rename to src/shared/Core/ModuleMessagesBroker.h
index 165adba863875fe0c70a1c5c2c70a7bc479efb4e..056b4792f7e0dca342b857ee47464e9c18114aa2 100644
--- a/src/shared/Core/modulemessagesbroker.h
+++ b/src/shared/Core/ModuleMessagesBroker.h
@@ -1,13 +1,12 @@
-#ifndef MODULEMESSAGESBROKER_H
-#define MODULEMESSAGESBROKER_H
+#pragma once
 
 #include <QList>
 #include <QMap>
 #include <QObject>
 #include <functional>
 
-#include "Message/modulemessage.h"
-#include "Message/topicfilter.h"
+#include "Message/ModuleMessage.h"
+#include "Message/TopicFilter.h"
 
 class Module;
 
@@ -37,5 +36,3 @@ public slots:
 private:
     CallbackCollection wildcardObservers, exactObservers;
 };
-
-#endif  // MODULEMESSAGESBROKER_H
diff --git a/src/shared/Core/modulesmanager.cpp b/src/shared/Core/ModulesManager.cpp
similarity index 96%
rename from src/shared/Core/modulesmanager.cpp
rename to src/shared/Core/ModulesManager.cpp
index 54f7b5acb2fcd2bd494c7e3894bc845570141754..3733f662f4f28c56fd9d27a64cb23e98494bd1c8 100644
--- a/src/shared/Core/modulesmanager.cpp
+++ b/src/shared/Core/ModulesManager.cpp
@@ -1,4 +1,4 @@
-#include "modulesmanager.h"
+#include "ModulesManager.h"
 
 #include <QDebug>
 #include <QDir>
@@ -6,11 +6,11 @@
 #include <QMessageBox>
 #include <QStandardPaths>
 
-#include "Components/ModulesPicker/modulespicker.h"
-#include "Components/SaveConfigurationDialog/saveconfigurationdialog.h"
-#include "Core/module.h"
-#include "Core/xmlobject.h"
-#include "Modules/skywardhubstrings.h"
+#include "Components/ModulesPicker/ModulesPicker.h"
+#include "Components/SaveConfigurationDialog/SaveConfigurationDialog.h"
+#include "Core/Module.h"
+#include "Core/XmlObject.h"
+#include "Modules/SkywardHubStrings.h"
 
 ModulesList ModulesManager::modulesListHandler;
 
@@ -122,13 +122,8 @@ Module* ModulesManager::instantiateDefaultModule()
 
 Module* ModulesManager::invokeModulesPickerService()
 {
-#ifdef MODULESPICKER_H
-
     ModulesPicker* p = new ModulesPicker();
     return p->start();
-
-#endif
-    return nullptr;
 }
 
 QList<QString> ModulesManager::getModulesNamesList()
@@ -258,7 +253,6 @@ void ModulesManager::openConfigurationWindow()
         return;
     }
 
-#ifdef SAVECONFIGURATIONDIALOG_H
     // Ask configuration data to the user
     SaveConfigurationDialog* saveDialog = new SaveConfigurationDialog();
     saveDialog->setConfigName(SkywardHubStrings::defaultConfigurationFileName);
@@ -268,7 +262,6 @@ void ModulesManager::openConfigurationWindow()
     QString configIconPath;
     QString description;
     saveDialog->pickConfigData(&configName, &configIconPath, &description);
-#endif
 
     XmlObject xml(SkywardHubStrings::configurationNameValue);
     xml.addAttribute(SkywardHubStrings::configurationIconPathAttribute,
diff --git a/src/shared/Core/modulesmanager.h b/src/shared/Core/ModulesManager.h
similarity index 93%
rename from src/shared/Core/modulesmanager.h
rename to src/shared/Core/ModulesManager.h
index 4288010bae1fb0eb812b17d12ae3d93b4551f8b2..620265c3052636e64ff5a0281ffd7d2308bcb1ec 100644
--- a/src/shared/Core/modulesmanager.h
+++ b/src/shared/Core/ModulesManager.h
@@ -1,12 +1,11 @@
-#ifndef MODULESMANAGER_H
-#define MODULESMANAGER_H
+#pragma once
 
 #include <QMap>
 #include <QMenu>
 #include <QObject>
 #include <QString>
 
-#include "Modules/moduleslist.h"
+#include "Modules/ModulesList.h"
 
 class Module;
 class SaveConfigurationDialog;
@@ -65,5 +64,3 @@ private:
     QList<Module *> pages;
     QList<QAction *> menuActions;
 };
-
-#endif  // MODULESMANAGER_H
diff --git a/src/shared/Core/QCustomPlot/QCustomPlot.cpp b/src/shared/Core/QCustomPlot/QCustomPlot.cpp
index 90676021b46966a86aee1dcf8c6d95c2bcb5c931..44e767d1df2afdfa04559bdb6c9e715c0c88fb1a 100644
--- a/src/shared/Core/QCustomPlot/QCustomPlot.cpp
+++ b/src/shared/Core/QCustomPlot/QCustomPlot.cpp
@@ -15739,7 +15739,7 @@ void QCustomPlot::setSelectionRect(QCPSelectionRect *selectionRect)
   files. \note If you are using a Qt version before 5.0, you must also add the
   module "opengl" to your \c QT variable in the qmake project files. For Qt
   versions 5.0 and higher, QCustomPlot switches to a newer OpenGL interface
-  which is already in the "gui" module.
+  which is already in the ".h" module.
 */
 void QCustomPlot::setOpenGl(bool enabled, int multisampling)
 {
diff --git a/src/shared/Core/skywardhubcore.cpp b/src/shared/Core/SkywardHubCore.cpp
similarity index 94%
rename from src/shared/Core/skywardhubcore.cpp
rename to src/shared/Core/SkywardHubCore.cpp
index 33fd2723df5e7f11db830a1b51c88ec474b1d82e..dbc0891ad909d8464f91338d4bc454ec76e29e66 100644
--- a/src/shared/Core/skywardhubcore.cpp
+++ b/src/shared/Core/SkywardHubCore.cpp
@@ -1,12 +1,14 @@
-#include "skywardhubcore.h"
+#include "SkywardHubCore.h"
+
+#include <Modules/SkywardHubStrings.h>
 
 #include <QDir>
 #include <QMessageBox>
 
-#include "module.h"
-#include "moduleeventshandler.h"
-#include "modulemessagesbroker.h"
-#include "modulesmanager.h"
+#include "Module.h"
+#include "ModuleEventsHandler.h"
+#include "ModuleMessagesBroker.h"
+#include "ModulesManager.h"
 
 SkywardHubCore::SkywardHubCore()
 {
diff --git a/src/shared/Core/skywardhubcore.h b/src/shared/Core/SkywardHubCore.h
similarity index 87%
rename from src/shared/Core/skywardhubcore.h
rename to src/shared/Core/SkywardHubCore.h
index ccc724a4888fc67eee886747d8e72302d054ff77..528fe3fcc24a48ad72cf9d89327ed01fdbf9e490 100644
--- a/src/shared/Core/skywardhubcore.h
+++ b/src/shared/Core/SkywardHubCore.h
@@ -1,10 +1,8 @@
-#ifndef SKYWARDHUBCORE_H
-#define SKYWARDHUBCORE_H
+#pragma once
 
 #include <QObject>
 
-#include "Modules/skywardhubstrings.h"
-#include "xmlobject.h"
+#include "XmlObject.h"
 
 class ModulesManager;
 class ModuleEventsHandler;
@@ -55,5 +53,3 @@ public:
 private:
     static SkywardHubCore *core;
 };
-
-#endif  // SKYWARDHUBCORE_H
diff --git a/src/shared/Core/xmlobject.cpp b/src/shared/Core/XmlObject.cpp
similarity index 99%
rename from src/shared/Core/xmlobject.cpp
rename to src/shared/Core/XmlObject.cpp
index 9a0ec8c603a0e0749bbe259da152ed98c028765f..06f9e3e92996744aedba834ac38892669d49e8d3 100644
--- a/src/shared/Core/xmlobject.cpp
+++ b/src/shared/Core/XmlObject.cpp
@@ -1,4 +1,4 @@
-#include "xmlobject.h"
+#include "XmlObject.h"
 
 #include <QFile>
 #include <QTextStream>
diff --git a/src/shared/Core/xmlobject.h b/src/shared/Core/XmlObject.h
similarity index 97%
rename from src/shared/Core/xmlobject.h
rename to src/shared/Core/XmlObject.h
index 22080dbc0475d4379c70d8523fb9177363fac9d6..7f13cea349647616bd638c0e91015c858451f61c 100644
--- a/src/shared/Core/xmlobject.h
+++ b/src/shared/Core/XmlObject.h
@@ -1,5 +1,4 @@
-#ifndef XMLOBJECT_H
-#define XMLOBJECT_H
+#pragma once
 
 #include <QMap>
 #include <QMapIterator>
@@ -97,5 +96,3 @@ private:
     QString textValue     = "";
     QString xmlObjectName = "";
 };
-
-#endif  // XMLOBJECT_H
diff --git a/src/shared/Modules/CommandPad/CommandPad.h b/src/shared/Modules/CommandPad/CommandPad.h
index 25b37d9d0c9e4fada82ea38f4bae9387afe9fdba..4a0c6819e56d30ecc367eaa59154797d3a39e1ee 100644
--- a/src/shared/Modules/CommandPad/CommandPad.h
+++ b/src/shared/Modules/CommandPad/CommandPad.h
@@ -1,8 +1,7 @@
-#ifndef COMMANDPAD_H
-#define COMMANDPAD_H
+#pragma once
 
 #include <Modules/CommandPad/MessageFormElement.h>
-#include <Modules/DefaultModule/defaultmodule.h>
+#include <Modules/DefaultModule/DefaultModule.h>
 
 #include <tuple>
 
@@ -26,5 +25,3 @@ private:
     QComboBox* messagesListComboBox;
     QMap<QString, MessageFormElement*> formElements;
 };
-
-#endif  // COMMANDPAD_H
diff --git a/src/shared/Modules/CommandPad/MessageFormElement.cpp b/src/shared/Modules/CommandPad/MessageFormElement.cpp
index e372e6de1cdc96b9fbbf89b713350a1b6a9b0408..5d3fb2952a782d24d6d3401b5addff699821d711 100644
--- a/src/shared/Modules/CommandPad/MessageFormElement.cpp
+++ b/src/shared/Modules/CommandPad/MessageFormElement.cpp
@@ -1,6 +1,6 @@
 #include "MessageFormElement.h"
 
-#include <Modules/skywardhubstrings.h>
+#include <Modules/SkywardHubStrings.h>
 
 MessageFormElement::MessageFormElement() {}
 
diff --git a/src/shared/Modules/CommandPad/MessageFormElement.h b/src/shared/Modules/CommandPad/MessageFormElement.h
index cc4961481dafbbcdd959995b7296dbc62d57430c..dc736fbd7eff0fe0c1b92efcba791859ed4fe03f 100644
--- a/src/shared/Modules/CommandPad/MessageFormElement.h
+++ b/src/shared/Modules/CommandPad/MessageFormElement.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <Core/Message/modulemessage.h>
-#include <Core/xmlobject.h>
+#include <Core/Message/ModuleMessage.h>
+#include <Core/XmlObject.h>
 
 #include <QComboBox>
 #include <QGridLayout>
diff --git a/src/shared/Modules/CommandPad/MessagesList.h b/src/shared/Modules/CommandPad/MessagesList.h
index fab2bf58aafd4d673355c0ab1238c7751cbb6652..34c60ef2d23594350552cdab060a1e65f6d7f415 100644
--- a/src/shared/Modules/CommandPad/MessagesList.h
+++ b/src/shared/Modules/CommandPad/MessagesList.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Modules/CommandPad/MessageFormElement.h>
-#include <Modules/Mavlink/mavlinkversionheader.h>
+#include <Modules/Mavlink/MavlinkVersionHeader.h>
 
 #include <QMap>
 #include <QString>
diff --git a/src/shared/Modules/CompactCommandPad/CommandSelector.h b/src/shared/Modules/CompactCommandPad/CommandSelector.h
index 1215f0f780ae99b1cf63e42fa27331c9b535ed32..d8d16e577243a547eb1f40ba58bdf5447b384a51 100644
--- a/src/shared/Modules/CompactCommandPad/CommandSelector.h
+++ b/src/shared/Modules/CompactCommandPad/CommandSelector.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <Core/xmlobject.h>
+#include <Core/XmlObject.h>
 #include <Modules/CommandPad/MessageFormElement.h>
-#include <Modules/DefaultModule/defaultmodule.h>
+#include <Modules/DefaultModule/DefaultModule.h>
 
 #include <QBoxLayout>
 #include <QCheckBox>
diff --git a/src/shared/Modules/CompactCommandPad/CompactCommandPad.h b/src/shared/Modules/CompactCommandPad/CompactCommandPad.h
index 95da8691dfac82f8dfd20df35691a1237182047e..6dba4910d4083d49abbe4f3c8424ec153dde23a0 100644
--- a/src/shared/Modules/CompactCommandPad/CompactCommandPad.h
+++ b/src/shared/Modules/CompactCommandPad/CompactCommandPad.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Modules/CompactCommandPad/CommandSelector.h>
-#include <Modules/DefaultModule/defaultmodule.h>
+#include <Modules/DefaultModule/DefaultModule.h>
 
 #include <QTimer>
 
diff --git a/src/shared/Modules/CompactCommandPad/SendThread.h b/src/shared/Modules/CompactCommandPad/SendThread.h
index 4252e2cb3b722e2edf795d6721d49fcc1ef20416..4ef3be8642a2e58f8b7fc982039c900899cd6761 100644
--- a/src/shared/Modules/CompactCommandPad/SendThread.h
+++ b/src/shared/Modules/CompactCommandPad/SendThread.h
@@ -2,7 +2,7 @@
 
 #include <QThread>
 
-#include "Core/modulemessagesbroker.h"
+#include "Core/ModuleMessagesBroker.h"
 
 class SendThread : public QThread
 {
diff --git a/src/shared/Modules/DefaultModule/defaultmodule.cpp b/src/shared/Modules/DefaultModule/DefaultModule.cpp
similarity index 96%
rename from src/shared/Modules/DefaultModule/defaultmodule.cpp
rename to src/shared/Modules/DefaultModule/DefaultModule.cpp
index 2bcb311cbc7700e6420ab0de71ddd6bdb418f222..900a1a16d908ceed12581bec022d0553a393d391 100644
--- a/src/shared/Modules/DefaultModule/defaultmodule.cpp
+++ b/src/shared/Modules/DefaultModule/DefaultModule.cpp
@@ -1,9 +1,9 @@
-#include "defaultmodule.h"
+#include "DefaultModule.h"
 
 #include <QCloseEvent>
 
-#include "Components/ContextMenuSeparator/contextmenuseparator.h"
-#include "Core/modulesmanager.h"
+#include "Components/ContextMenuSeparator/ContextMenuSeparator.h"
+#include "Core/ModulesManager.h"
 
 DefaultModule::DefaultModule(QWidget* parent) : Module(parent) {}
 
diff --git a/src/shared/Modules/DefaultModule/defaultmodule.h b/src/shared/Modules/DefaultModule/DefaultModule.h
similarity index 84%
rename from src/shared/Modules/DefaultModule/defaultmodule.h
rename to src/shared/Modules/DefaultModule/DefaultModule.h
index a2266aa42c2187a0831bdd55b1746fa0fdbe354a..9f30cdc33ebaaab7ccfe9e788c0fa2e4f2278412 100644
--- a/src/shared/Modules/DefaultModule/defaultmodule.h
+++ b/src/shared/Modules/DefaultModule/DefaultModule.h
@@ -1,11 +1,10 @@
-#ifndef DEFAULTMODULE_H
-#define DEFAULTMODULE_H
+#pragma once
 
-#include "Components/ErrorDisplayer/errordisplayer.h"
-#include "Core/module.h"
-#include "Core/skywardhubcore.h"
-#include "Modules/MainWindow/window.h"
-#include "Modules/moduleinfo.h"
+#include "Components/ErrorDisplayer/ErrorDisplayer.h"
+#include "Core/Module.h"
+#include "Core/SkywardHubCore.h"
+#include "Modules/MainWindow/Window.h"
+#include "Modules/ModuleInfo.h"
 
 class DefaultModule : public Module
 {
@@ -54,5 +53,3 @@ private:
     QString menuName;
     bool areDefaultSettingsDone = false;
 };
-
-#endif  // DEFAULTMODULE_H
diff --git a/src/shared/Modules/Empty/emptymodule.cpp b/src/shared/Modules/Empty/EmptyModule.cpp
similarity index 82%
rename from src/shared/Modules/Empty/emptymodule.cpp
rename to src/shared/Modules/Empty/EmptyModule.cpp
index 098dad04c54a5c3e4700ea3bb531aee4ac0e7783..f9e544b4035803f6612f6e6b94622e94887f2e37 100644
--- a/src/shared/Modules/Empty/emptymodule.cpp
+++ b/src/shared/Modules/Empty/EmptyModule.cpp
@@ -1,12 +1,12 @@
-#include "emptymodule.h"
+#include "EmptyModule.h"
 
 #include <QAction>
 #include <QMessageBox>
 #include <QPoint>
 
-#include "Components/ContextMenuSeparator/contextmenuseparator.h"
-#include "Core/modulesmanager.h"
-#include "ui_emptymodule.h"
+#include "Components/ContextMenuSeparator/ContextMenuSeparator.h"
+#include "Core/ModulesManager.h"
+#include "ui_EmptyModule.h"
 
 EmptyModule::EmptyModule() : DefaultModule(), ui(new Ui::EmptyModule)
 {
diff --git a/src/shared/Modules/Empty/emptymodule.h b/src/shared/Modules/Empty/EmptyModule.h
similarity index 77%
rename from src/shared/Modules/Empty/emptymodule.h
rename to src/shared/Modules/Empty/EmptyModule.h
index 15b32437fb808291211cb5e5d6b4d583ac9de476..df01964b86ada54307e19b1cf758d08350149098 100644
--- a/src/shared/Modules/Empty/emptymodule.h
+++ b/src/shared/Modules/Empty/EmptyModule.h
@@ -1,12 +1,11 @@
-#ifndef EMPTYMODULE_H
-#define EMPTYMODULE_H
+#pragma once
 
 #include <QMenu>
 #include <QSharedPointer>
 #include <QWidget>
 
-#include "Core/module.h"
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Core/Module.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 namespace Ui
 {
@@ -35,5 +34,3 @@ protected slots:
 private:
     Ui::EmptyModule* ui;
 };
-
-#endif  // EMPTYMODULE_H
diff --git a/src/shared/Modules/Empty/emptymodule.ui b/src/shared/Modules/Empty/EmptyModule.ui
similarity index 100%
rename from src/shared/Modules/Empty/emptymodule.ui
rename to src/shared/Modules/Empty/EmptyModule.ui
diff --git a/src/shared/Modules/FileStream/filestreammodule.cpp b/src/shared/Modules/FileStream/FileStreamModule.cpp
similarity index 97%
rename from src/shared/Modules/FileStream/filestreammodule.cpp
rename to src/shared/Modules/FileStream/FileStreamModule.cpp
index 8025d5f6d97ba66239f3cedffd96f87beef09d32..63693c28f42037b6a57c5e520a0a4bd7ba12f9e5 100644
--- a/src/shared/Modules/FileStream/filestreammodule.cpp
+++ b/src/shared/Modules/FileStream/FileStreamModule.cpp
@@ -1,4 +1,4 @@
-#include "filestreammodule.h"
+#include "FileStreamModule.h"
 
 #include <QDebug>
 #include <QDesktopServices>
@@ -6,9 +6,9 @@
 #include <QMessageBox>
 #include <QUrl>
 
-#include "Core/modulemessagesbroker.h"
-#include "Modules/skywardhubstrings.h"
-#include "ui_filestreammodule.h"
+#include "Core/ModuleMessagesBroker.h"
+#include "Modules/SkywardHubStrings.h"
+#include "ui_FileStreamModule.h"
 
 FileStreamModule::FileStreamModule(QWidget* parent)
     : DefaultModule(parent), ui(new Ui::FileStreamModule)
diff --git a/src/shared/Modules/FileStream/filestreammodule.h b/src/shared/Modules/FileStream/FileStreamModule.h
similarity index 85%
rename from src/shared/Modules/FileStream/filestreammodule.h
rename to src/shared/Modules/FileStream/FileStreamModule.h
index b95820bb24a31064347094aaa51b43d6035ebf8c..6054cc845f835c447ede1c75ba509f966860c3e3 100644
--- a/src/shared/Modules/FileStream/filestreammodule.h
+++ b/src/shared/Modules/FileStream/FileStreamModule.h
@@ -1,12 +1,11 @@
-#ifndef FILESTREAMMODULE_H
-#define FILESTREAMMODULE_H
+#pragma once
 
 #include <QFile>
 #include <QLineEdit>
 #include <QWidget>
 
-#include "Core/Message/modulemessage.h"
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 namespace Ui
 {
@@ -53,5 +52,3 @@ private:
     QList<QLineEdit*> topicViewsList;
     QFile file;
 };
-
-#endif  // FILESTREAMMODULE_H
diff --git a/src/shared/Modules/FileStream/filestreammodule.ui b/src/shared/Modules/FileStream/FileStreamModule.ui
similarity index 100%
rename from src/shared/Modules/FileStream/filestreammodule.ui
rename to src/shared/Modules/FileStream/FileStreamModule.ui
diff --git a/src/shared/Modules/Graph/Graph.cpp b/src/shared/Modules/Graph/Graph.cpp
index 39ea093e861f4b5a468c17a6059e6b792665cf0b..914dc8313f1e1a0d5719d10b58f9f3fd4c5000e8 100644
--- a/src/shared/Modules/Graph/Graph.cpp
+++ b/src/shared/Modules/Graph/Graph.cpp
@@ -1,8 +1,8 @@
 #include "Graph.h"
 
-#include <Components/ContextMenuSeparator/contextmenuseparator.h>
-#include <Components/SubscriptionsPanel/subscriptionspanel.h>
-#include <Core/modulemessagesbroker.h>
+#include <Components/ContextMenuSeparator/ContextMenuSeparator.h>
+#include <Components/SubscriptionsPanel/SubscriptionsPanel.h>
+#include <Core/ModuleMessagesBroker.h>
 
 #include <QTimer>
 #include <algorithm>
diff --git a/src/shared/Modules/Graph/Graph.h b/src/shared/Modules/Graph/Graph.h
index 041cede4c1078ea80e9017ea0ecb419411eeb9c1..dacb40a904a782aa8be9b988705a65987a9d8dce 100644
--- a/src/shared/Modules/Graph/Graph.h
+++ b/src/shared/Modules/Graph/Graph.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <Core/Message/modulemessage.h>
-#include <Core/Message/topicandfieldfilter.h>
+#include <Core/Message/ModuleMessage.h>
+#include <Core/Message/TopicAndFieldFilter.h>
+#include <Core/Module.h>
 #include <Core/QCustomPlot/QCustomPlot.h>
-#include <Core/module.h>
-#include <Modules/DefaultModule/defaultmodule.h>
+#include <Modules/DefaultModule/DefaultModule.h>
 
 #include <QList>
 #include <QTimer>
diff --git a/src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.cpp b/src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.cpp
similarity index 98%
rename from src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.cpp
rename to src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.cpp
index 28b4297e6e8f6f70e2d3d0eff39057649fb8f03c..e2e985a8ffdd3b64e9e6635353d33e9d063bbdec 100644
--- a/src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.cpp
+++ b/src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.cpp
@@ -1,8 +1,8 @@
-#include "incomingmessagesviewermodule.h"
+#include "IncomingMessagesViewerModule.h"
 
 #include <QHBoxLayout>
 
-#include "Components/SubscriptionsPanel/subscriptionspanel.h"
+#include "Components/SubscriptionsPanel/SubscriptionsPanel.h"
 
 IncomingMessagesViewerModule::IncomingMessagesViewerModule(QWidget* parent)
     : DefaultModule(parent)
diff --git a/src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h b/src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.h
similarity index 77%
rename from src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h
rename to src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.h
index 66b4f07b1aa0eb6f618942dfdd6eb4761ca260df..03b4cdce8d51568125cd7ea9a0d22e3e6a8ccbb8 100644
--- a/src/shared/Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h
+++ b/src/shared/Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.h
@@ -1,8 +1,7 @@
-#ifndef INCOMINGMESSAGESVIEWERMODULE_H
-#define INCOMINGMESSAGESVIEWERMODULE_H
+#pragma once
 
-#include "Core/Message/topicandfieldfilter.h"
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Core/Message/TopicAndFieldFilter.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 class IncomingMessagesViewerModule : public DefaultModule
 {
@@ -33,5 +32,3 @@ private:
     bool useTimestamp = false;
     QAction* useTimestampAction;
 };
-
-#endif  // INCOMINGMESSAGESVIEWERMODULE_H
diff --git a/src/shared/Modules/MainWindow/skywardhubmainwindow.cpp b/src/shared/Modules/MainWindow/SkywardHubMainWindow.cpp
similarity index 93%
rename from src/shared/Modules/MainWindow/skywardhubmainwindow.cpp
rename to src/shared/Modules/MainWindow/SkywardHubMainWindow.cpp
index 9e2ff42e95f9fc022b20c23847ecd8096002d42b..6d08441b21181c326daada867310bc6ee022d657 100644
--- a/src/shared/Modules/MainWindow/skywardhubmainwindow.cpp
+++ b/src/shared/Modules/MainWindow/SkywardHubMainWindow.cpp
@@ -1,10 +1,10 @@
-#include "skywardhubmainwindow.h"
+#include "SkywardHubMainWindow.h"
 
 #include <QFile>
 #include <QMenu>
 
-#include "Core/module.h"
-#include "Core/modulesmanager.h"
+#include "Core/Module.h"
+#include "Core/ModulesManager.h"
 
 SkywardHubMainWindow::SkywardHubMainWindow(QWidget* parent)
     : QMainWindow(parent)
diff --git a/src/shared/Modules/MainWindow/skywardhubmainwindow.h b/src/shared/Modules/MainWindow/SkywardHubMainWindow.h
similarity index 69%
rename from src/shared/Modules/MainWindow/skywardhubmainwindow.h
rename to src/shared/Modules/MainWindow/SkywardHubMainWindow.h
index 8c2683aa17eafbe2de9663d8653a616025318d32..f10f30d2f9d10127cf2c986d82414950924bf076 100644
--- a/src/shared/Modules/MainWindow/skywardhubmainwindow.h
+++ b/src/shared/Modules/MainWindow/SkywardHubMainWindow.h
@@ -1,10 +1,9 @@
-#ifndef SKYWARDHUBMAINWINDOW_H
-#define SKYWARDHUBMAINWINDOW_H
+#pragma once
 
 #include <QMainWindow>
 
-#include "Core/skywardhubcore.h"
-#include "window.h"
+#include "Core/SkywardHubCore.h"
+#include "Window.h"
 
 class SkywardHubMainWindow : public QMainWindow
 {
@@ -21,5 +20,3 @@ private:
     SkywardHubCoreProxy core;
     Window *mainWindow;
 };
-
-#endif  // SKYWARDHUBMAINWINDOW_H
diff --git a/src/shared/Modules/MainWindow/window.cpp b/src/shared/Modules/MainWindow/Window.cpp
similarity index 94%
rename from src/shared/Modules/MainWindow/window.cpp
rename to src/shared/Modules/MainWindow/Window.cpp
index e04516a8aebd9f3203ee27e6824f8ea8139de544..49b50cb1e7df61a52b7a6542b5b14dd369498c88 100644
--- a/src/shared/Modules/MainWindow/window.cpp
+++ b/src/shared/Modules/MainWindow/Window.cpp
@@ -1,10 +1,10 @@
-#include "window.h"
+#include "Window.h"
 
 #include <QVBoxLayout>
 
-#include "Core/module.h"
-#include "Core/modulesmanager.h"
-#include "ui_window.h"
+#include "Core/Module.h"
+#include "Core/ModulesManager.h"
+#include "ui_Window.h"
 
 Window::Window(QWidget* parent) : QWidget(parent), ui(new Ui::Window)
 {
diff --git a/src/shared/Modules/MainWindow/window.h b/src/shared/Modules/MainWindow/Window.h
similarity index 80%
rename from src/shared/Modules/MainWindow/window.h
rename to src/shared/Modules/MainWindow/Window.h
index 8872c76bc4ede8c46b5a57e43bf99aa395b3bb7b..2d9312fbb3ef48222b06002baca4f677bbd707ce 100644
--- a/src/shared/Modules/MainWindow/window.h
+++ b/src/shared/Modules/MainWindow/Window.h
@@ -1,11 +1,10 @@
-#ifndef WINDOW_H
-#define WINDOW_H
+#pragma once
 
 #include <QMenu>
 #include <QWidget>
 
-#include "Components/ErrorDisplayer/error.h"
-#include "Components/ErrorDisplayer/errordisplayer.h"
+#include "Components/ErrorDisplayer/Error.h"
+#include "Components/ErrorDisplayer/ErrorDisplayer.h"
 
 class Module;
 
@@ -39,5 +38,3 @@ private:
     Ui::Window *ui;
     Module *centralModule = nullptr;
 };
-
-#endif  // WINDOW_H
diff --git a/src/shared/Modules/MainWindow/window.ui b/src/shared/Modules/MainWindow/Window.ui
similarity index 100%
rename from src/shared/Modules/MainWindow/window.ui
rename to src/shared/Modules/MainWindow/Window.ui
diff --git a/src/shared/Modules/Mavlink/mavlinkcommandadapter.cpp b/src/shared/Modules/Mavlink/MavlinkCommandAdapter.cpp
similarity index 96%
rename from src/shared/Modules/Mavlink/mavlinkcommandadapter.cpp
rename to src/shared/Modules/Mavlink/MavlinkCommandAdapter.cpp
index 58c4909d7d575e31471fbd4341472104cd922953..ccd7a12bd425ac3d0e0227cae5aa1066317ee4cd 100644
--- a/src/shared/Modules/Mavlink/mavlinkcommandadapter.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkCommandAdapter.cpp
@@ -1,10 +1,10 @@
-#include "mavlinkcommandadapter.h"
+#include "MavlinkCommandAdapter.h"
 
-#include "Core/modulesmanager.h"
-#include "Core/xmlobject.h"
-#include "Modules/skywardhubstrings.h"
-#include "mavlinkmodule.h"
-#include "mavlinkversionheader.h"
+#include "Core/ModulesManager.h"
+#include "Core/XmlObject.h"
+#include "MavlinkModule.h"
+#include "MavlinkVersionHeader.h"
+#include "Modules/SkywardHubStrings.h"
 
 MavlinkCommandAdapter::MavlinkCommandAdapter() {}
 
diff --git a/src/shared/Modules/Mavlink/mavlinkcommandadapter.h b/src/shared/Modules/Mavlink/MavlinkCommandAdapter.h
similarity index 75%
rename from src/shared/Modules/Mavlink/mavlinkcommandadapter.h
rename to src/shared/Modules/Mavlink/MavlinkCommandAdapter.h
index 9a7b269e16125797758e972e7fc9aebb43ba2eb0..a26014abc297ce6774695946c298d7d7f2c13bcd 100644
--- a/src/shared/Modules/Mavlink/mavlinkcommandadapter.h
+++ b/src/shared/Modules/Mavlink/MavlinkCommandAdapter.h
@@ -1,14 +1,13 @@
-#ifndef MAVLINKCOMMANDADAPTER_H
-#define MAVLINKCOMMANDADAPTER_H
+#pragma once
 
 #include <QMap>
 #include <QObject>
 #include <QSerialPort>
 
-#include "Core/Message/modulemessage.h"
-#include "Core/modulesmanager.h"
-#include "mavlinkversionheader.h"
-#include "mavlinkwriter.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Core/ModulesManager.h"
+#include "MavlinkVersionHeader.h"
+#include "MavlinkWriter.h"
 
 class MavlinkModule;
 
@@ -37,5 +36,3 @@ private:
     MavlinkWriter mavlinkWriter;
     QMap<QString, int> msgNameIdMap;
 };
-
-#endif  // MAVLINKCOMMANDADAPTER_H
diff --git a/src/shared/Modules/Mavlink/mavlinkmodule.cpp b/src/shared/Modules/Mavlink/MavlinkModule.cpp
similarity index 97%
rename from src/shared/Modules/Mavlink/mavlinkmodule.cpp
rename to src/shared/Modules/Mavlink/MavlinkModule.cpp
index 7d7bd59c09868bdaf8a287f81f697eae060cc045..7704c4c892a2d29dc4a5216895d1e56c128b5794 100644
--- a/src/shared/Modules/Mavlink/mavlinkmodule.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkModule.cpp
@@ -1,11 +1,11 @@
-#include "mavlinkmodule.h"
+#include "MavlinkModule.h"
 
 #include <QDebug>
 #include <QSerialPortInfo>
 
-#include "Components/ContextMenuSeparator/contextmenuseparator.h"
-#include "Core/modulemessagesbroker.h"
-#include "Modules/skywardhubstrings.h"
+#include "Components/ContextMenuSeparator/ContextMenuSeparator.h"
+#include "Core/ModuleMessagesBroker.h"
+#include "Modules/SkywardHubStrings.h"
 
 MavlinkModule::MavlinkModule(QWidget *parent)
     : DefaultModule(parent), mavlinkReader(this), serialPort(this)
diff --git a/src/shared/Modules/Mavlink/mavlinkmodule.h b/src/shared/Modules/Mavlink/MavlinkModule.h
similarity index 81%
rename from src/shared/Modules/Mavlink/mavlinkmodule.h
rename to src/shared/Modules/Mavlink/MavlinkModule.h
index e64b54ad6c35113e22f4b4ad8ccb00ed8f75fd4f..2243200e52fb59fc5917c9f5e832d5b45de3a31e 100644
--- a/src/shared/Modules/Mavlink/mavlinkmodule.h
+++ b/src/shared/Modules/Mavlink/MavlinkModule.h
@@ -1,16 +1,15 @@
-#ifndef MAVLINKMODULE_H
-#define MAVLINKMODULE_H
+#pragma once
 
 #include <QSerialPort>
 #include <QTimer>
 #include <QWidget>
 
-#include "Components/ToggleButton/togglebutton.h"
-#include "Core/Message/modulemessage.h"
-#include "Core/module.h"
-#include "Modules/DefaultModule/defaultmodule.h"
-#include "mavlinkcommandadapter.h"
-#include "mavlinkreader.h"
+#include "Components/ToggleButton/ToggleButton.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Core/Module.h"
+#include "MavlinkCommandAdapter.h"
+#include "MavlinkReader.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 Q_DECLARE_METATYPE(ModuleMessage);
 
@@ -70,5 +69,3 @@ private:
     int msgArrived              = 0;
     bool portOpen;
 };
-
-#endif  // MAVLINKMODULE_H
diff --git a/src/shared/Modules/Mavlink/mavlinkreader.cpp b/src/shared/Modules/Mavlink/MavlinkReader.cpp
similarity index 98%
rename from src/shared/Modules/Mavlink/mavlinkreader.cpp
rename to src/shared/Modules/Mavlink/MavlinkReader.cpp
index 1d59c2e6170565a299201be8e0d7d1363921de64..560bc0561b2f520a68e9d9706680af188f52eb17 100644
--- a/src/shared/Modules/Mavlink/mavlinkreader.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkReader.cpp
@@ -1,13 +1,13 @@
-#include "mavlinkreader.h"
+#include "MavlinkReader.h"
 
 #include <QDebug>
 #include <QDir>
 #include <QFile>
 #include <QTextStream>
 
-#include "Modules/skywardhubstrings.h"
-#include "mavlinkcommandadapter.h"
-#include "mavlinkmodule.h"
+#include "MavlinkCommandAdapter.h"
+#include "MavlinkModule.h"
+#include "Modules/SkywardHubStrings.h"
 
 MavlinkReader::MavlinkReader(MavlinkModule* parent) : module(parent) {}
 
diff --git a/src/shared/Modules/Mavlink/mavlinkreader.h b/src/shared/Modules/Mavlink/MavlinkReader.h
similarity index 87%
rename from src/shared/Modules/Mavlink/mavlinkreader.h
rename to src/shared/Modules/Mavlink/MavlinkReader.h
index a9b7c0143d4d6b3657f55ab900407d1be7968628..22d29830fed7ca2700b8cef9733ed8a7e9846995 100644
--- a/src/shared/Modules/Mavlink/mavlinkreader.h
+++ b/src/shared/Modules/Mavlink/MavlinkReader.h
@@ -1,13 +1,12 @@
-#ifndef MAVLINKREADER_H
-#define MAVLINKREADER_H
+#pragma once
 
 #include <QDateTime>
 #include <QFile>
 #include <QSerialPort>
 
-#include "Core/Message/modulemessage.h"
-#include "Core/xmlobject.h"
-#include "mavlinkversionheader.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Core/XmlObject.h"
+#include "MavlinkVersionHeader.h"
 
 class MavlinkModule;
 
@@ -56,5 +55,3 @@ private:
     QString logFilePath = "";
     QFile logFile;
 };
-
-#endif  // MAVLINKREADER_H
diff --git a/src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp b/src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.cpp
similarity index 97%
rename from src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp
rename to src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.cpp
index 0822fd00a3f0cde551272f65e9ab6485a2b93e4f..83decea70ecafe550659de83e31d23c047739d0b 100644
--- a/src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.cpp
@@ -1,15 +1,15 @@
-#include "mavlinkrocketmsgtestingmodule.h"
+#include "MavlinkRocketMsgTestingModule.h"
 
-#include <Core/modulemessagesbroker.h>
+#include <Core/ModuleMessagesBroker.h>
 
 #include <QDebug>
 #include <QMap>
 
-#include "Core/xmlobject.h"
-#include "mavlinkcommandadapter.h"
-#include "mavlinkreader.h"
-#include "mavlinkversionheader.h"
-#include "ui_mavlinkrocketmsgtestingmodule.h"
+#include "Core/XmlObject.h"
+#include "MavlinkCommandAdapter.h"
+#include "MavlinkReader.h"
+#include "MavlinkVersionHeader.h"
+#include "ui_MavlinkRocketMsgTestingModule.h"
 
 MavlinkRocketMsgTestingModule::MavlinkRocketMsgTestingModule(QWidget* parent)
     : DefaultModule(parent), ui(new Ui::MavlinkRocketMsgTestingModule)
diff --git a/src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h b/src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.h
similarity index 90%
rename from src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h
rename to src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.h
index 6736b8a17b626c2e4f8384b83a8016f972b616fb..f7a06fec51e839e66f9257e1f3002a4e32dc8db3 100644
--- a/src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.h
+++ b/src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.h
@@ -1,12 +1,11 @@
-#ifndef MAVLINKROCKETMSGTESTINGMODULE_H
-#define MAVLINKROCKETMSGTESTINGMODULE_H
+#pragma once
 
 #include <QGroupBox>
 #include <QLineEdit>
 #include <QRadioButton>
 
-#include "Modules/DefaultModule/defaultmodule.h"
-#include "Modules/skywardhubstrings.h"
+#include "Modules/DefaultModule/DefaultModule.h"
+#include "Modules/SkywardHubStrings.h"
 
 namespace Ui
 {
@@ -83,5 +82,3 @@ private:
 
     QMap<QString, QGroupBox *> viewGroupList;
 };
-
-#endif  // MAVLINKROCKETMSGTESTINGMODULE_H
diff --git a/src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui b/src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.ui
similarity index 100%
rename from src/shared/Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui
rename to src/shared/Modules/Mavlink/MavlinkRocketMsgTestingModule.ui
diff --git a/src/shared/Modules/Mavlink/mavlinkversionheader.h b/src/shared/Modules/Mavlink/MavlinkVersionHeader.h
similarity index 76%
rename from src/shared/Modules/Mavlink/mavlinkversionheader.h
rename to src/shared/Modules/Mavlink/MavlinkVersionHeader.h
index 3ec786b999e5bcaa7c2babb626d7498db1c843d3..cd0a11dae45bdb6bdd176c91a5907a5fef4002e4 100644
--- a/src/shared/Modules/Mavlink/mavlinkversionheader.h
+++ b/src/shared/Modules/Mavlink/MavlinkVersionHeader.h
@@ -1,5 +1,4 @@
-#ifndef MAVLINKVERSIONHEADER_H
-#define MAVLINKVERSIONHEADER_H
+#pragma once
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-align"
@@ -9,5 +8,3 @@
 
 // static __attribute__((unused)) uint8_t validSysid = 171;
 // static __attribute__((unused)) uint8_t validCompid = 96;
-
-#endif  // MAVLINKVERSIONHEADER_H
diff --git a/src/shared/Modules/Mavlink/mavlinkwriter.cpp b/src/shared/Modules/Mavlink/MavlinkWriter.cpp
similarity index 95%
rename from src/shared/Modules/Mavlink/mavlinkwriter.cpp
rename to src/shared/Modules/Mavlink/MavlinkWriter.cpp
index 4bfef20eb576f7866961717adad829d8cc3f18a9..910e71aa6fb10ae19edafba5105ccf86cc00fafe 100644
--- a/src/shared/Modules/Mavlink/mavlinkwriter.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkWriter.cpp
@@ -1,4 +1,4 @@
-#include "mavlinkwriter.h"
+#include "MavlinkWriter.h"
 
 #include <chrono>
 
diff --git a/src/shared/Modules/Mavlink/mavlinkwriter.h b/src/shared/Modules/Mavlink/MavlinkWriter.h
similarity index 72%
rename from src/shared/Modules/Mavlink/mavlinkwriter.h
rename to src/shared/Modules/Mavlink/MavlinkWriter.h
index 8b3d4489b5ae4bc80e6f808577997db79fb47e7a..0e76b33833aafd267301cfe0b5fc9bb2f8a2948f 100644
--- a/src/shared/Modules/Mavlink/mavlinkwriter.h
+++ b/src/shared/Modules/Mavlink/MavlinkWriter.h
@@ -1,10 +1,9 @@
-#ifndef MAVLINKWRITER_H
-#define MAVLINKWRITER_H
+#pragma once
 
 #include <QMutex>
 #include <QSerialPort>
 
-#include "mavlinkversionheader.h"
+#include "MavlinkVersionHeader.h"
 
 class MavlinkWriter : public QObject
 {
@@ -20,5 +19,3 @@ private:
     QSerialPort* serial = nullptr;
     QMutex mtx;
 };
-
-#endif  // MAVLINKWRITER_H
diff --git a/src/shared/Modules/moduleinfo.cpp b/src/shared/Modules/ModuleInfo.cpp
similarity index 98%
rename from src/shared/Modules/moduleinfo.cpp
rename to src/shared/Modules/ModuleInfo.cpp
index 5758d0872dfe88a7f383a4c523a9a14dce11c8bd..a3613be2dcc8bf346a12538955de0bd9e73a53b5 100644
--- a/src/shared/Modules/moduleinfo.cpp
+++ b/src/shared/Modules/ModuleInfo.cpp
@@ -1,4 +1,4 @@
-#include "moduleinfo.h"
+#include "ModuleInfo.h"
 
 ModuleInfo::ModuleInfo() {}
 
diff --git a/src/shared/Modules/moduleinfo.h b/src/shared/Modules/ModuleInfo.h
similarity index 95%
rename from src/shared/Modules/moduleinfo.h
rename to src/shared/Modules/ModuleInfo.h
index 76b29257c2137a49ef10e4ac090e90f89676385e..e153fc7bde7be01b872e61044abc38777cb1f72c 100644
--- a/src/shared/Modules/moduleinfo.h
+++ b/src/shared/Modules/ModuleInfo.h
@@ -1,5 +1,4 @@
-#ifndef MODULEINFO_H
-#define MODULEINFO_H
+#pragma once
 
 #include <QStringList>
 
@@ -73,5 +72,3 @@ private:
     std::function<Module*()> factory;
     QStringList moduleSourceFiles;
 };
-
-#endif  // MODULEINFO_H
diff --git a/src/shared/Modules/moduleslist.cpp b/src/shared/Modules/ModulesList.cpp
similarity index 92%
rename from src/shared/Modules/moduleslist.cpp
rename to src/shared/Modules/ModulesList.cpp
index 6076b53a7742c4607d992999981f24191e243ef8..93fd7ef32a3c98c2e223ffef8dff92c7d6c7c1b1 100644
--- a/src/shared/Modules/moduleslist.cpp
+++ b/src/shared/Modules/ModulesList.cpp
@@ -1,23 +1,23 @@
-#include "moduleslist.h"
+#include "ModulesList.h"
 
-#include <Components/ModulesPicker/modulespicker.h>
+#include <Components/ModulesPicker/ModulesPicker.h>
 #include <Modules/CommandPad/CommandPad.h>
 #include <Modules/CompactCommandPad/CompactCommandPad.h>
-#include <Modules/Empty/emptymodule.h>
-#include <Modules/FileStream/filestreammodule.h>
+#include <Modules/Empty/EmptyModule.h>
+#include <Modules/FileStream/FileStreamModule.h>
 #include <Modules/Graph/Graph.h>
-#include <Modules/IncomingMessagesViewer/incomingmessagesviewermodule.h>
-#include <Modules/Mavlink/mavlinkmodule.h>
-#include <Modules/Mavlink/mavlinkrocketmsgtestingmodule.h>
+#include <Modules/IncomingMessagesViewer/IncomingMessagesViewerModule.h>
+#include <Modules/Mavlink/MavlinkModule.h>
+#include <Modules/Mavlink/MavlinkRocketMsgTestingModule.h>
 #include <Modules/OrientationVisualizer/OrientationVisualizer.h>
-#include <Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h>
-#include <Modules/SkywardHub/skywardhubmodule.h>
+#include <Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.h>
+#include <Modules/SkywardHub/SkywardHubModule.h>
 #include <Modules/Splitter/Splitter.h>
 #include <Modules/StateViewer/StateViewer.h>
-#include <Modules/Tabs/tabsmodule.h>
-#include <Modules/Test/testmodule.h>
-#include <Modules/TimerController/timercontrollermodule.h>
-#include <Modules/ValuesConverterViewer/valuesconverterviewermodule.h>
+#include <Modules/Tabs/TabsModule.h>
+#include <Modules/Test/TestModule.h>
+#include <Modules/TimerController/TimerControllerModule.h>
+#include <Modules/ValuesConverterViewer/ValuesConverterViewerModule.h>
 
 void ModulesList::createModuleList()
 {
diff --git a/src/shared/Modules/moduleslist.h b/src/shared/Modules/ModulesList.h
similarity index 84%
rename from src/shared/Modules/moduleslist.h
rename to src/shared/Modules/ModulesList.h
index ccb0702cbaab7f7b64596b3038c65526dbb66e7f..3238d6b04278638aadb19aa705e1861b0850067c 100644
--- a/src/shared/Modules/moduleslist.h
+++ b/src/shared/Modules/ModulesList.h
@@ -1,9 +1,8 @@
-#ifndef MODULESLIST_H
-#define MODULESLIST_H
+#pragma once
 
 #include <QMap>
 
-#include "moduleinfo.h"
+#include "ModuleInfo.h"
 
 class ModulesList
 {
@@ -26,5 +25,3 @@ public:
 private:
     QList<ModuleInfo> modulesInfo;
 };
-
-#endif  // MODULESLIST_H
diff --git a/src/shared/Modules/OrientationVisualizer/OrientationVisualizer.h b/src/shared/Modules/OrientationVisualizer/OrientationVisualizer.h
index a14d7657eec8ba6b973c54dbd17b653df70f522b..b7192d3ece2434c4814083424d9cc08c8eeb4c6f 100644
--- a/src/shared/Modules/OrientationVisualizer/OrientationVisualizer.h
+++ b/src/shared/Modules/OrientationVisualizer/OrientationVisualizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Modules/DefaultModule/defaultmodule.h>
+#include <Modules/DefaultModule/DefaultModule.h>
 
 #include <Qt3DCore/QTransform>
 
diff --git a/src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
similarity index 96%
rename from src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp
rename to src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
index f4228bafe1b6ad0609d561b484bcaa848f0e7ccc..17a43ea2fde5cd3ef1764f02df62f165ad0fd390 100644
--- a/src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.cpp
+++ b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.cpp
@@ -1,10 +1,10 @@
-#include "outgoingmessagesviewermodule.h"
+#include "OutgoingMessagesViewerModule.h"
 
 #include <QTableWidgetItem>
 
-#include "Core/modulemessagesbroker.h"
-#include "Modules/skywardhubstrings.h"
-#include "ui_outgoingmessagesviewermodule.h"
+#include "Core/ModuleMessagesBroker.h"
+#include "Modules/SkywardHubStrings.h"
+#include "ui_OutgoingMessagesViewerModule.h"
 
 OutgoingMessagesViewerModule::OutgoingMessagesViewerModule(QWidget* parent)
     : DefaultModule(parent), ui(new Ui::OutgoingMessagesViewerModule)
diff --git a/src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.h
similarity index 83%
rename from src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h
rename to src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.h
index 4a6c2c4fa1e2a0c8e36a83aa891201e7ff416041..48204d3c16bd2cc96fcc34bb15fc1843fb0eb01a 100644
--- a/src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.h
+++ b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.h
@@ -1,11 +1,10 @@
-#ifndef OUTCOMINGMESSAGESVIEWERMODULE_H
-#define OUTCOMINGMESSAGESVIEWERMODULE_H
+#pragma once
 
 #include <QWidget>
 
-#include "Core/Message/modulemessage.h"
-#include "Core/module.h"
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Core/Module.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 class QTableWidgetItem;
 
@@ -58,5 +57,3 @@ private:
     QList<MessageLog> messages;
     int maxSize = 10;
 };
-
-#endif  // OUTCOMINGMESSAGESVIEWERMODULE_H
diff --git a/src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui b/src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.ui
similarity index 100%
rename from src/shared/Modules/OutgoingMessagesViewer/outgoingmessagesviewermodule.ui
rename to src/shared/Modules/OutgoingMessagesViewer/OutgoingMessagesViewerModule.ui
diff --git a/src/shared/Modules/SkywardHub/deployer.cpp b/src/shared/Modules/SkywardHub/Deployer.cpp
similarity index 99%
rename from src/shared/Modules/SkywardHub/deployer.cpp
rename to src/shared/Modules/SkywardHub/Deployer.cpp
index f7f5529efab3d5364ed1554a733727c81db8e221..772f9e4475719c2adab9f7c7f8fae62636b3b10a 100644
--- a/src/shared/Modules/SkywardHub/deployer.cpp
+++ b/src/shared/Modules/SkywardHub/Deployer.cpp
@@ -1,4 +1,4 @@
-#include "deployer.h"
+#include "Deployer.h"
 
 #include <QDir>
 #include <QFile>
@@ -57,7 +57,7 @@ void Deployer::setupModulesFiles(const QList<QString>& activeModules)
     modulesFiles.append("Core/");
     modulesFiles.append("moduleinfo");
     modulesFiles.append("moduleslist");
-    modulesFiles.append("skywardhubstrings");
+    modulesFiles.append("SkywardHubStrings");
     modulesFiles.append("main.cpp");
     modulesFiles.append("Modules/Empty/");
     modulesFiles.append("Modules/DefaultModule/");
diff --git a/src/shared/Modules/SkywardHub/deployer.h b/src/shared/Modules/SkywardHub/Deployer.h
similarity index 93%
rename from src/shared/Modules/SkywardHub/deployer.h
rename to src/shared/Modules/SkywardHub/Deployer.h
index 8afcb0b1758a1d910af86ff5a2412b946b445a89..6a33e95ae1935e217a82bed74c859cfe623bf663 100644
--- a/src/shared/Modules/SkywardHub/deployer.h
+++ b/src/shared/Modules/SkywardHub/Deployer.h
@@ -1,12 +1,11 @@
-#ifndef DEPLOYER_H
-#define DEPLOYER_H
+#pragma once
 
 #include <QList>
 #include <QProcess>
 #include <QString>
 
-#include "Core/xmlobject.h"
-#include "deployerpathpicker.h"
+#include "Core/XmlObject.h"
+#include "DeployerPathPicker.h"
 
 class Deployer
 {
@@ -61,5 +60,3 @@ private:
 
     DeployerPathPicker deployerPicker;
 };
-
-#endif  // DEPLOYER_H
diff --git a/src/shared/Modules/SkywardHub/deployerpathpicker.cpp b/src/shared/Modules/SkywardHub/DeployerPathPicker.cpp
similarity index 97%
rename from src/shared/Modules/SkywardHub/deployerpathpicker.cpp
rename to src/shared/Modules/SkywardHub/DeployerPathPicker.cpp
index b83406c4f43ac005747db9ef1cb1125b76615bfe..69531a0c7e82d4f0ffe83eaace5d8421e8e392eb 100644
--- a/src/shared/Modules/SkywardHub/deployerpathpicker.cpp
+++ b/src/shared/Modules/SkywardHub/DeployerPathPicker.cpp
@@ -1,8 +1,8 @@
-#include "deployerpathpicker.h"
+#include "DeployerPathPicker.h"
 
 #include <QFileDialog>
 
-#include "ui_deployerpathpicker.h"
+#include "ui_DeployerPathPicker.h"
 
 DeployerPathPicker::DeployerPathPicker(QWidget *parent)
     : QDialog(parent), ui(new Ui::DeployerPathPicker)
diff --git a/src/shared/Modules/SkywardHub/deployerpathpicker.h b/src/shared/Modules/SkywardHub/DeployerPathPicker.h
similarity index 88%
rename from src/shared/Modules/SkywardHub/deployerpathpicker.h
rename to src/shared/Modules/SkywardHub/DeployerPathPicker.h
index 294cc24ee4255cdf34bcbb67127372dea97b36d4..0a16cc96b970d9f0ec1de68bc3e2c20cfb1b799b 100644
--- a/src/shared/Modules/SkywardHub/deployerpathpicker.h
+++ b/src/shared/Modules/SkywardHub/DeployerPathPicker.h
@@ -1,5 +1,4 @@
-#ifndef DEPLOYERPATHPICKER_H
-#define DEPLOYERPATHPICKER_H
+#pragma once
 
 #include <QDialog>
 
@@ -36,5 +35,3 @@ private:
     Ui::DeployerPathPicker *ui;
     bool pickConfirmed;
 };
-
-#endif  // DEPLOYERPATHPICKER_H
diff --git a/src/shared/Modules/SkywardHub/deployerpathpicker.ui b/src/shared/Modules/SkywardHub/DeployerPathPicker.ui
similarity index 100%
rename from src/shared/Modules/SkywardHub/deployerpathpicker.ui
rename to src/shared/Modules/SkywardHub/DeployerPathPicker.ui
diff --git a/src/shared/Modules/SkywardHub/prefabdialog.cpp b/src/shared/Modules/SkywardHub/PrefabDialog.cpp
similarity index 97%
rename from src/shared/Modules/SkywardHub/prefabdialog.cpp
rename to src/shared/Modules/SkywardHub/PrefabDialog.cpp
index f649c3fb27610c5a2f65c6e61748655c37cd4e07..462baa0beee70f3f082918856a55e828833c6187 100644
--- a/src/shared/Modules/SkywardHub/prefabdialog.cpp
+++ b/src/shared/Modules/SkywardHub/PrefabDialog.cpp
@@ -1,6 +1,6 @@
-#include "prefabdialog.h"
+#include "PrefabDialog.h"
 
-#include "ui_prefabdialog.h"
+#include "ui_PrefabDialog.h"
 
 PrefabDialog::PrefabDialog(QWidget *parent)
     : QDialog(parent), ui(new Ui::PrefabDialog)
diff --git a/src/shared/Modules/SkywardHub/prefabdialog.h b/src/shared/Modules/SkywardHub/PrefabDialog.h
similarity index 84%
rename from src/shared/Modules/SkywardHub/prefabdialog.h
rename to src/shared/Modules/SkywardHub/PrefabDialog.h
index ab85fdf5e4a062bbeb3a4275b2f5a29fefd0b3c8..0e4083fd9cfdaba0fe20e1252ffe636a716b206c 100644
--- a/src/shared/Modules/SkywardHub/prefabdialog.h
+++ b/src/shared/Modules/SkywardHub/PrefabDialog.h
@@ -1,5 +1,4 @@
-#ifndef PREFABDIALOG_H
-#define PREFABDIALOG_H
+#pragma once
 
 #include <QDialog>
 
@@ -26,5 +25,3 @@ signals:
 private:
     Ui::PrefabDialog *ui;
 };
-
-#endif  // PREFABDIALOG_H
diff --git a/src/shared/Modules/SkywardHub/prefabdialog.ui b/src/shared/Modules/SkywardHub/PrefabDialog.ui
similarity index 100%
rename from src/shared/Modules/SkywardHub/prefabdialog.ui
rename to src/shared/Modules/SkywardHub/PrefabDialog.ui
diff --git a/src/shared/Modules/SkywardHub/prefabviewelement.cpp b/src/shared/Modules/SkywardHub/PrefabViewElement.cpp
similarity index 96%
rename from src/shared/Modules/SkywardHub/prefabviewelement.cpp
rename to src/shared/Modules/SkywardHub/PrefabViewElement.cpp
index 906c7b44cb11001f4edb9f4d3c2b6550498869f4..75352d6447947d2b9821b113bf9136f942784e1a 100644
--- a/src/shared/Modules/SkywardHub/prefabviewelement.cpp
+++ b/src/shared/Modules/SkywardHub/PrefabViewElement.cpp
@@ -1,7 +1,7 @@
-#include "prefabviewelement.h"
+#include "PrefabViewElement.h"
 
-#include "Modules/skywardhubstrings.h"
-#include "ui_prefabviewelement.h"
+#include "Modules/SkywardHubStrings.h"
+#include "ui_PrefabViewElement.h"
 
 PrefabViewElement::PrefabViewElement(const QString &name, QWidget *parent)
     : QWidget(parent), ui(new Ui::PrefabViewElement)
diff --git a/src/shared/Modules/SkywardHub/prefabviewelement.h b/src/shared/Modules/SkywardHub/PrefabViewElement.h
similarity index 92%
rename from src/shared/Modules/SkywardHub/prefabviewelement.h
rename to src/shared/Modules/SkywardHub/PrefabViewElement.h
index 4819de4e86c47ef4293c40bffb6a2b34d8b98a78..0b443d7d3bbdf99a4b4a4b6d5f1351293443fa48 100644
--- a/src/shared/Modules/SkywardHub/prefabviewelement.h
+++ b/src/shared/Modules/SkywardHub/PrefabViewElement.h
@@ -1,9 +1,8 @@
-#ifndef PREFABVIEWELEMENT_H
-#define PREFABVIEWELEMENT_H
+#pragma once
 
 #include <QWidget>
 
-#include "Core/xmlobject.h"
+#include "Core/XmlObject.h"
 
 namespace Ui
 {
@@ -64,5 +63,3 @@ private:
     int height = 0;
     int width  = 0;
 };
-
-#endif  // PREFABVIEWELEMENT_H
diff --git a/src/shared/Modules/SkywardHub/prefabviewelement.ui b/src/shared/Modules/SkywardHub/PrefabViewElement.ui
similarity index 100%
rename from src/shared/Modules/SkywardHub/prefabviewelement.ui
rename to src/shared/Modules/SkywardHub/PrefabViewElement.ui
diff --git a/src/shared/Modules/SkywardHub/skywardhubmodule.cpp b/src/shared/Modules/SkywardHub/SkywardHubModule.cpp
similarity index 97%
rename from src/shared/Modules/SkywardHub/skywardhubmodule.cpp
rename to src/shared/Modules/SkywardHub/SkywardHubModule.cpp
index 7ef12dcd113304329500288c3d442a895d20a342..e46b4b504f86439739496975400ae55bcde7d2d8 100644
--- a/src/shared/Modules/SkywardHub/skywardhubmodule.cpp
+++ b/src/shared/Modules/SkywardHub/SkywardHubModule.cpp
@@ -1,18 +1,18 @@
-#include "skywardhubmodule.h"
+#include "SkywardHubModule.h"
 
 #include <QDir>
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
 
-#include "Core/modulesmanager.h"
-#include "Modules/MainWindow/skywardhubmainwindow.h"
-#include "Modules/skywardhubstrings.h"
+#include "Core/ModulesManager.h"
+#include "Deployer.h"
+#include "Modules/MainWindow/SkywardHubMainWindow.h"
+#include "Modules/SkywardHubStrings.h"
+#include "PrefabDialog.h"
+#include "PrefabViewElement.h"
 #include "QMessageBox"
-#include "deployer.h"
-#include "prefabdialog.h"
-#include "prefabviewelement.h"
-#include "ui_skywardhubmodule.h"
+#include "ui_SkywardHubModule.h"
 
 SkywardHubModule::SkywardHubModule(QWidget *parent)
     : DefaultModule(parent), ui(new Ui::SkywardHubModule)
diff --git a/src/shared/Modules/SkywardHub/skywardhubmodule.h b/src/shared/Modules/SkywardHub/SkywardHubModule.h
similarity index 93%
rename from src/shared/Modules/SkywardHub/skywardhubmodule.h
rename to src/shared/Modules/SkywardHub/SkywardHubModule.h
index a20706f4757a4907d94da0fe29f0591d42f428d3..8bdaba7011b3b7c0a3ba635c8c58f20577b6525c 100644
--- a/src/shared/Modules/SkywardHub/skywardhubmodule.h
+++ b/src/shared/Modules/SkywardHub/SkywardHubModule.h
@@ -1,11 +1,10 @@
-#ifndef SKYWARDHUBMODULE_H
-#define SKYWARDHUBMODULE_H
+#pragma once
 
 #include <QCheckBox>
 #include <QVBoxLayout>
 #include <QWidget>
 
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 class PrefabViewElement;
 
@@ -65,5 +64,3 @@ private:
     int nextRow                        = 0;
     int maxColum                       = 5;
 };
-
-#endif  // SKYWARDHUBMODULE_H
diff --git a/src/shared/Modules/SkywardHub/skywardhubmodule.ui b/src/shared/Modules/SkywardHub/SkywardHubModule.ui
similarity index 100%
rename from src/shared/Modules/SkywardHub/skywardhubmodule.ui
rename to src/shared/Modules/SkywardHub/SkywardHubModule.ui
diff --git a/src/shared/Modules/skywardhubstrings.h b/src/shared/Modules/SkywardHubStrings.h
similarity index 96%
rename from src/shared/Modules/skywardhubstrings.h
rename to src/shared/Modules/SkywardHubStrings.h
index b8b8c6c91c951d4b987cfed7c2b14029c5a561a8..330c6f874864c494a3f70aad48b1c9236991558d 100644
--- a/src/shared/Modules/skywardhubstrings.h
+++ b/src/shared/Modules/SkywardHubStrings.h
@@ -1,5 +1,4 @@
-#ifndef SKYWARDHUBSTRINGS_H
-#define SKYWARDHUBSTRINGS_H
+#pragma once
 
 #include <QStandardPaths>
 #include <QString>
@@ -60,5 +59,3 @@ static const QString mavlink_received_msg_NACK_topic =
     mavlink_received_msg_topic + "/NACK_TM";
 
 };  // namespace SkywardHubStrings
-
-#endif  // SKYWARDHUBSTRINGS_H
diff --git a/src/shared/Modules/Splitter/Splitter.cpp b/src/shared/Modules/Splitter/Splitter.cpp
index abce604e89ec5aa6e2b358d7b2f1dafe5b92c8a1..dc08eb7657968addeecb68674fb880ef5899a933 100644
--- a/src/shared/Modules/Splitter/Splitter.cpp
+++ b/src/shared/Modules/Splitter/Splitter.cpp
@@ -1,7 +1,7 @@
 #include "Splitter.h"
 
-#include <Components/ContextMenuSeparator/contextmenuseparator.h>
-#include <Core/modulesmanager.h>
+#include <Components/ContextMenuSeparator/ContextMenuSeparator.h>
+#include <Core/ModulesManager.h>
 
 #include <QDebug>
 #include <QLabel>
diff --git a/src/shared/Modules/Splitter/Splitter.h b/src/shared/Modules/Splitter/Splitter.h
index ef309a7b3b66e99b58e43a6dc99cb19cb6206e18..f7a1f6bd68fb40b1355a0536c6ef9c4a8f84f039 100644
--- a/src/shared/Modules/Splitter/Splitter.h
+++ b/src/shared/Modules/Splitter/Splitter.h
@@ -3,8 +3,8 @@
 #include <QSplitter>
 #include <QWidget>
 
-#include "Core/module.h"
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Core/Module.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 class Splitter : public DefaultModule
 {
diff --git a/src/shared/Modules/StateViewer/StateViewer.cpp b/src/shared/Modules/StateViewer/StateViewer.cpp
index aa263af50758c889e32f5b074b309e73b78fbf2c..f80aaa5a26e965ea0a67e959456ce643292f7a5c 100644
--- a/src/shared/Modules/StateViewer/StateViewer.cpp
+++ b/src/shared/Modules/StateViewer/StateViewer.cpp
@@ -1,7 +1,7 @@
 #include "StateViewer.h"
 
-#include <Components/TopicAndFieldFilterSelector/topicandfieldfilterselector.h>
-#include <Core/modulemessagesbroker.h>
+#include <Components/TopicAndFieldFilterSelector/TopicAndFieldFilterSelector.h>
+#include <Core/ModuleMessagesBroker.h>
 
 StateViewerModule::StateViewerModule(QWidget* parent) : DefaultModule(parent)
 {
diff --git a/src/shared/Modules/StateViewer/StateViewer.h b/src/shared/Modules/StateViewer/StateViewer.h
index 0ae00252d097e74a79d0480cc673d772fd0cd1f5..194d574ae0526d39e90f558a9b865bffe8029aa1 100644
--- a/src/shared/Modules/StateViewer/StateViewer.h
+++ b/src/shared/Modules/StateViewer/StateViewer.h
@@ -1,9 +1,8 @@
-#ifndef STATEVIEWERMODULE_H
-#define STATEVIEWERMODULE_H
+#pragma once
 
-#include <Core/Message/modulemessage.h>
-#include <Core/Message/topicandfieldfilter.h>
-#include <Modules/DefaultModule/defaultmodule.h>
+#include <Core/Message/ModuleMessage.h>
+#include <Core/Message/TopicAndFieldFilter.h>
+#include <Modules/DefaultModule/DefaultModule.h>
 
 #include <QLabel>
 #include <QWidget>
@@ -35,5 +34,3 @@ private:
     TopicAndFieldFilter filter;
     StatesList::State currentState;
 };
-
-#endif  // STATEVIEWERMODULE_H
diff --git a/src/shared/Modules/Tabs/tabsmodule.cpp b/src/shared/Modules/Tabs/TabsModule.cpp
similarity index 99%
rename from src/shared/Modules/Tabs/tabsmodule.cpp
rename to src/shared/Modules/Tabs/TabsModule.cpp
index 2ab442812f8088ebb689b1d1671b99e20bc5dc16..c3092fc97af019c2247b15e54b9b31fe52bbcff9 100644
--- a/src/shared/Modules/Tabs/tabsmodule.cpp
+++ b/src/shared/Modules/Tabs/TabsModule.cpp
@@ -1,10 +1,10 @@
-#include "tabsmodule.h"
+#include "TabsModule.h"
 
 #include <QBoxLayout>
 #include <QDebug>
 #include <QLabel>
 
-#include "Core/modulesmanager.h"
+#include "Core/ModulesManager.h"
 
 TabsModule::TabsModule(QWidget* parent) : DefaultModule{parent}
 {
diff --git a/src/shared/Modules/Tabs/tabsmodule.h b/src/shared/Modules/Tabs/TabsModule.h
similarity index 89%
rename from src/shared/Modules/Tabs/tabsmodule.h
rename to src/shared/Modules/Tabs/TabsModule.h
index 6cc741b61cb694bc4d9f75b9cfcb672c2042af44..fc181e8df2b406ed4f99aad15384ba91e7a20b85 100644
--- a/src/shared/Modules/Tabs/tabsmodule.h
+++ b/src/shared/Modules/Tabs/TabsModule.h
@@ -1,11 +1,10 @@
-#ifndef TABSMODULE_H
-#define TABSMODULE_H
+#pragma once
 
 #include <QListWidget>
 #include <QStackedWidget>
 #include <QWidget>
 
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 class TabsModule : public DefaultModule
 {
@@ -42,5 +41,3 @@ private:
 
     void setupUi();
 };
-
-#endif  // TABSMODULE_H
diff --git a/src/shared/Modules/Test/testmodule.cpp b/src/shared/Modules/Test/TestModule.cpp
similarity index 90%
rename from src/shared/Modules/Test/testmodule.cpp
rename to src/shared/Modules/Test/TestModule.cpp
index 51dfce3b69cd4e4b2b5e76268091ecc44fd26cd9..b9eec753313a1f5763845139458be0abb5b5e90e 100644
--- a/src/shared/Modules/Test/testmodule.cpp
+++ b/src/shared/Modules/Test/TestModule.cpp
@@ -1,9 +1,9 @@
-#include "testmodule.h"
+#include "TestModule.h"
 
-#include "Components/ContextMenuSeparator/contextmenuseparator.h"
-#include "Core/modulemessagesbroker.h"
-#include "Core/modulesmanager.h"
-#include "ui_testmodule.h"
+#include "Components/ContextMenuSeparator/ContextMenuSeparator.h"
+#include "Core/ModuleMessagesBroker.h"
+#include "Core/ModulesManager.h"
+#include "ui_TestModule.h"
 
 TestModule::TestModule(QWidget* parent)
     : DefaultModule(parent), ui(new Ui::TestModule)
diff --git a/src/shared/Modules/Test/testmodule.h b/src/shared/Modules/Test/TestModule.h
similarity index 82%
rename from src/shared/Modules/Test/testmodule.h
rename to src/shared/Modules/Test/TestModule.h
index f6e51c0d1e292dc57308cd94a9ce74ba79f269dc..8de16e6d9ed954ed8173c3cb386cd5e19dbda66f 100644
--- a/src/shared/Modules/Test/testmodule.h
+++ b/src/shared/Modules/Test/TestModule.h
@@ -1,9 +1,8 @@
-#ifndef TESTMODULE_H
-#define TESTMODULE_H
+#pragma once
 
 #include <QWidget>
 
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 namespace Ui
 {
@@ -35,5 +34,3 @@ private:
 
     int maxChar = 2000;
 };
-
-#endif  // TESTMODULE_H
diff --git a/src/shared/Modules/Test/testmodule.ui b/src/shared/Modules/Test/TestModule.ui
similarity index 100%
rename from src/shared/Modules/Test/testmodule.ui
rename to src/shared/Modules/Test/TestModule.ui
diff --git a/src/shared/Modules/TimerController/timercontrollermodule.cpp b/src/shared/Modules/TimerController/TimerControllerModule.cpp
similarity index 98%
rename from src/shared/Modules/TimerController/timercontrollermodule.cpp
rename to src/shared/Modules/TimerController/TimerControllerModule.cpp
index ada4cc4162c570fe5a453185ffe66841e051fcfa..abc76babcf7d48e3ce197ccdc32caff55442a91f 100644
--- a/src/shared/Modules/TimerController/timercontrollermodule.cpp
+++ b/src/shared/Modules/TimerController/TimerControllerModule.cpp
@@ -1,9 +1,9 @@
-#include "timercontrollermodule.h"
+#include "TimerControllerModule.h"
 
 #include <QFile>
 #include <QTextStream>
 
-#include "ui_timercontrollermodule.h"
+#include "ui_TimerControllerModule.h"
 
 TimerControllerModule::TimerControllerModule(QWidget *parent)
     : DefaultModule(parent), ui(new Ui::TimerControllerModule)
diff --git a/src/shared/Modules/TimerController/timercontrollermodule.h b/src/shared/Modules/TimerController/TimerControllerModule.h
similarity index 88%
rename from src/shared/Modules/TimerController/timercontrollermodule.h
rename to src/shared/Modules/TimerController/TimerControllerModule.h
index 1aeb7eeb170a5173958b85382e19e560abf16c09..f1d2d1db06ae74c520ea313b82823ba4d4824760 100644
--- a/src/shared/Modules/TimerController/timercontrollermodule.h
+++ b/src/shared/Modules/TimerController/TimerControllerModule.h
@@ -1,10 +1,9 @@
-#ifndef TIMERCONTROLLERMODULE_H
-#define TIMERCONTROLLERMODULE_H
+#pragma once
 
 #include <QTime>
 #include <QTimer>
 
-#include "Modules/DefaultModule/defaultmodule.h"
+#include "Modules/DefaultModule/DefaultModule.h"
 
 namespace Ui
 {
@@ -55,5 +54,3 @@ private:
     QString tMinus = "T- ";
     QString tPlus  = "T+ ";
 };
-
-#endif  // TIMERCONTROLLERMODULE_H
diff --git a/src/shared/Modules/TimerController/timercontrollermodule.ui b/src/shared/Modules/TimerController/TimerControllerModule.ui
similarity index 100%
rename from src/shared/Modules/TimerController/timercontrollermodule.ui
rename to src/shared/Modules/TimerController/TimerControllerModule.ui
diff --git a/src/shared/Modules/ValuesConverterViewer/valueelement.cpp b/src/shared/Modules/ValuesConverterViewer/ValueElement.cpp
similarity index 99%
rename from src/shared/Modules/ValuesConverterViewer/valueelement.cpp
rename to src/shared/Modules/ValuesConverterViewer/ValueElement.cpp
index 31d3f425927e4623da877eeebdc5d05db5d59eb1..1aea8bc4fd2749c18e5fbb9d78d929418abd82dd 100644
--- a/src/shared/Modules/ValuesConverterViewer/valueelement.cpp
+++ b/src/shared/Modules/ValuesConverterViewer/ValueElement.cpp
@@ -1,4 +1,4 @@
-#include "valueelement.h"
+#include "ValueElement.h"
 
 #include <QDebug>
 #include <QRadioButton>
diff --git a/src/shared/Modules/ValuesConverterViewer/valueelement.h b/src/shared/Modules/ValuesConverterViewer/ValueElement.h
similarity index 93%
rename from src/shared/Modules/ValuesConverterViewer/valueelement.h
rename to src/shared/Modules/ValuesConverterViewer/ValueElement.h
index a166d437582b5da36619b8dcbda3534b364681bf..4075e5badd2911eada73a1d9b8b5f8694b48cc2f 100644
--- a/src/shared/Modules/ValuesConverterViewer/valueelement.h
+++ b/src/shared/Modules/ValuesConverterViewer/ValueElement.h
@@ -1,9 +1,8 @@
-#ifndef VALUEELEMENT_H
-#define VALUEELEMENT_H
+#pragma once
 
 #include <QString>
 
-#include "Core/xmlobject.h"
+#include "Core/XmlObject.h"
 
 class ValueElement
 {
@@ -61,5 +60,3 @@ private:
     QString currentValue   = "";
     bool displayInView     = true;
 };
-
-#endif  // VALUEELEMENT_H
diff --git a/src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp b/src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.cpp
similarity index 96%
rename from src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp
rename to src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.cpp
index fc6e0f0bdace2f47ba6e1fbabf63bf32a09d8195..297de750326490d41cdf31b7c6fa386c38fd3d07 100644
--- a/src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.cpp
+++ b/src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.cpp
@@ -1,9 +1,9 @@
-#include "valuesconverterviewermodule.h"
+#include "ValuesConverterViewerModule.h"
 
-#include "Core/Message/topicandfieldfilter.h"
-#include "Core/modulemessagesbroker.h"
-#include "ui_valuesconverterviewermodule.h"
-#include "valuesviewerconfigpanel.h"
+#include "Core/Message/TopicAndFieldFilter.h"
+#include "Core/ModuleMessagesBroker.h"
+#include "ValuesViewerConfigPanel.h"
+#include "ui_ValuesConverterViewerModule.h"
 
 ValuesConverterViewerModule::ValuesConverterViewerModule(QWidget* parent)
     : DefaultModule(parent), ui(new Ui::ValuesConverterViewerModule)
diff --git a/src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.h b/src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.h
similarity index 83%
rename from src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.h
rename to src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.h
index 53a8543efbfe4032a39b28b7c6b4492927432bf9..432928f036cdb84bb2adfdb8cb53aba1489ecb21 100644
--- a/src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.h
+++ b/src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.h
@@ -1,12 +1,11 @@
-#ifndef VALUESCONVERTERVIEWERMODULE_H
-#define VALUESCONVERTERVIEWERMODULE_H
+#pragma once
 
 #include <QLabel>
 #include <QWidget>
 
-#include "Core/Message/modulemessage.h"
-#include "Modules/DefaultModule/defaultmodule.h"
-#include "valueelement.h"
+#include "Core/Message/ModuleMessage.h"
+#include "Modules/DefaultModule/DefaultModule.h"
+#include "ValueElement.h"
 
 class ValuesViewerConfigPanel;
 
@@ -49,5 +48,3 @@ private:
     QList<QLabel*> labels;
     QList<ValueElement> rules;
 };
-
-#endif  // VALUESCONVERTERVIEWERMODULE_H
diff --git a/src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.ui b/src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.ui
similarity index 100%
rename from src/shared/Modules/ValuesConverterViewer/valuesconverterviewermodule.ui
rename to src/shared/Modules/ValuesConverterViewer/ValuesConverterViewerModule.ui
diff --git a/src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp b/src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.cpp
similarity index 98%
rename from src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp
rename to src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.cpp
index 6fbfa97590a658b479548ce736700307029e9a10..5a014a4b4b443d313e5f8fdc3242ac11fbfde4ad 100644
--- a/src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.cpp
+++ b/src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.cpp
@@ -1,9 +1,9 @@
-#include "valuesviewerconfigpanel.h"
+#include "ValuesViewerConfigPanel.h"
 
 #include <QColorDialog>
 #include <QDebug>
 
-#include "ui_valuesviewerconfigpanel.h"
+#include "ui_ValuesViewerConfigPanel.h"
 
 ValuesViewerConfigPanel::ValuesViewerConfigPanel(QWidget* parent)
     : QWidget(parent), ui(new Ui::ValuesViewerConfigPanel)
diff --git a/src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.h b/src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.h
similarity index 89%
rename from src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.h
rename to src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.h
index d0f988ecc5ba49ef52a944c657e63fd1cfaa4ca3..de81e351625146f0b93a3d7bd71833d0563def2b 100644
--- a/src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.h
+++ b/src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.h
@@ -1,10 +1,9 @@
-#ifndef VALUESVIEWERCONFIGPANEL_H
-#define VALUESVIEWERCONFIGPANEL_H
+#pragma once
 
 #include <QRadioButton>
 #include <QWidget>
 
-#include "valueelement.h"
+#include "ValueElement.h"
 
 namespace Ui
 {
@@ -50,5 +49,3 @@ private:
     QList<ValueElement> rules;
     QList<QRadioButton *> views;
 };
-
-#endif  // VALUESVIEWERCONFIGPANEL_H
diff --git a/src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui b/src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.ui
similarity index 100%
rename from src/shared/Modules/ValuesConverterViewer/valuesviewerconfigpanel.ui
rename to src/shared/Modules/ValuesConverterViewer/ValuesViewerConfigPanel.ui