From 3c72e43b62da2e85fe811b162aa85531535c38ec Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Fri, 23 Sep 2022 21:55:11 +0200
Subject: [PATCH] [SBS] All files are now in camel case

---
 .vscode/settings.json                         | 17 +++-
 CMakeLists.txt                                | 90 +++++++++----------
 src/entrypoints/groundstation/main.cpp        |  2 +-
 ...separator.cpp => ContextMenuSeparator.cpp} |  2 +-
 ...menuseparator.h => ContextMenuSeparator.h} |  5 +-
 .../ErrorDisplayer/{error.cpp => Error.cpp}   |  4 +-
 .../ErrorDisplayer/{error.h => Error.h}       | 11 +--
 ...{errordisplayer.cpp => ErrorDisplayer.cpp} |  2 +-
 .../{errordisplayer.h => ErrorDisplayer.h}    |  7 +-
 .../{modulespicker.cpp => ModulesPicker.cpp}  |  6 +-
 .../{modulespicker.h => ModulesPicker.h}      |  7 +-
 .../{modulespicker.ui => ModulesPicker.ui}    |  0
 ...dialog.cpp => SaveConfigurationDialog.cpp} |  4 +-
 ...tiondialog.h => SaveConfigurationDialog.h} |  5 +-
 ...ondialog.ui => SaveConfigurationDialog.ui} |  0
 ...ptionspanel.cpp => SubscriptionsPanel.cpp} |  6 +-
 ...scriptionspanel.h => SubscriptionsPanel.h} |  7 +-
 ...riptionspanel.ui => SubscriptionsPanel.ui} |  0
 .../{togglebutton.cpp => ToggleButton.cpp}    |  2 +-
 .../{togglebutton.h => ToggleButton.h}        |  5 +-
 ...or.cpp => TopicAndFieldFilterSelector.cpp} |  2 +-
 ...lector.h => TopicAndFieldFilterSelector.h} |  7 +-
 ...erselector.cpp => TopicFilterSelector.cpp} |  2 +-
 ...filterselector.h => TopicFilterSelector.h} |  7 +-
 .../{messagefield.cpp => MessageField.cpp}    |  2 +-
 .../{messagefield.h => MessageField.h}        |  5 +-
 .../{modulemessage.cpp => ModuleMessage.cpp}  |  2 +-
 .../{modulemessage.h => ModuleMessage.h}      |  9 +-
 .../Core/Message/{topic.cpp => Topic.cpp}     |  2 +-
 src/shared/Core/Message/{topic.h => Topic.h}  |  0
 ...ieldfilter.cpp => TopicAndFieldFilter.cpp} |  2 +-
 ...andfieldfilter.h => TopicAndFieldFilter.h} | 11 +--
 .../{topicfilter.cpp => TopicFilter.cpp}      |  2 +-
 .../Message/{topicfilter.h => TopicFilter.h}  |  2 +-
 src/shared/Core/{module.cpp => Module.cpp}    |  2 +-
 src/shared/Core/{module.h => Module.h}        | 10 +--
 ...ntshandler.cpp => ModuleEventsHandler.cpp} |  2 +-
 ...eeventshandler.h => ModuleEventsHandler.h} |  5 +-
 ...gesbroker.cpp => ModuleMessagesBroker.cpp} |  6 +-
 ...essagesbroker.h => ModuleMessagesBroker.h} |  9 +-
 ...{modulesmanager.cpp => ModulesManager.cpp} | 19 ++--
 .../{modulesmanager.h => ModulesManager.h}    |  7 +-
 src/shared/Core/QCustomPlot/QCustomPlot.cpp   |  2 +-
 ...{skywardhubcore.cpp => SkywardHubCore.cpp} | 12 +--
 .../{skywardhubcore.h => SkywardHubCore.h}    |  8 +-
 .../Core/{xmlobject.cpp => XmlObject.cpp}     |  2 +-
 src/shared/Core/{xmlobject.h => XmlObject.h}  |  5 +-
 src/shared/Modules/CommandPad/CommandPad.h    |  7 +-
 .../Modules/CommandPad/MessageFormElement.cpp |  2 +-
 .../Modules/CommandPad/MessageFormElement.h   |  4 +-
 src/shared/Modules/CommandPad/MessagesList.h  |  2 +-
 .../CompactCommandPad/CommandSelector.h       |  4 +-
 .../CompactCommandPad/CompactCommandPad.h     |  2 +-
 .../Modules/CompactCommandPad/SendThread.h    |  2 +-
 .../{defaultmodule.cpp => DefaultModule.cpp}  |  6 +-
 .../{defaultmodule.h => DefaultModule.h}      | 15 ++--
 .../{emptymodule.cpp => EmptyModule.cpp}      |  8 +-
 .../Empty/{emptymodule.h => EmptyModule.h}    |  9 +-
 .../Empty/{emptymodule.ui => EmptyModule.ui}  |  0
 ...estreammodule.cpp => FileStreamModule.cpp} |  8 +-
 ...{filestreammodule.h => FileStreamModule.h} |  9 +-
 ...ilestreammodule.ui => FileStreamModule.ui} |  0
 src/shared/Modules/Graph/Graph.cpp            |  6 +-
 src/shared/Modules/Graph/Graph.h              |  8 +-
 ...e.cpp => IncomingMessagesViewerModule.cpp} |  4 +-
 ...odule.h => IncomingMessagesViewerModule.h} |  9 +-
 ...ainwindow.cpp => SkywardHubMainWindow.cpp} |  6 +-
 ...hubmainwindow.h => SkywardHubMainWindow.h} |  9 +-
 .../MainWindow/{window.cpp => Window.cpp}     |  8 +-
 .../Modules/MainWindow/{window.h => Window.h} |  9 +-
 .../MainWindow/{window.ui => Window.ui}       |  0
 ...dadapter.cpp => MavlinkCommandAdapter.cpp} | 12 +--
 ...mmandadapter.h => MavlinkCommandAdapter.h} | 13 ++-
 .../{mavlinkmodule.cpp => MavlinkModule.cpp}  |  8 +-
 .../{mavlinkmodule.h => MavlinkModule.h}      | 17 ++--
 .../{mavlinkreader.cpp => MavlinkReader.cpp}  |  8 +-
 .../{mavlinkreader.h => MavlinkReader.h}      | 11 +--
 ....cpp => MavlinkRocketMsgTestingModule.cpp} | 14 +--
 ...dule.h => MavlinkRocketMsgTestingModule.h} |  9 +-
 ...le.ui => MavlinkRocketMsgTestingModule.ui} |  0
 ...versionheader.h => MavlinkVersionHeader.h} |  5 +-
 .../{mavlinkwriter.cpp => MavlinkWriter.cpp}  |  2 +-
 .../{mavlinkwriter.h => MavlinkWriter.h}      |  7 +-
 .../{moduleinfo.cpp => ModuleInfo.cpp}        |  2 +-
 .../Modules/{moduleinfo.h => ModuleInfo.h}    |  5 +-
 .../{moduleslist.cpp => ModulesList.cpp}      | 26 +++---
 .../Modules/{moduleslist.h => ModulesList.h}  |  7 +-
 .../OrientationVisualizer.h                   |  2 +-
 ...e.cpp => OutgoingMessagesViewerModule.cpp} |  8 +-
 ...odule.h => OutgoingMessagesViewerModule.h} | 11 +--
 ...ule.ui => OutgoingMessagesViewerModule.ui} |  0
 .../SkywardHub/{deployer.cpp => Deployer.cpp} |  4 +-
 .../SkywardHub/{deployer.h => Deployer.h}     |  9 +-
 ...rpathpicker.cpp => DeployerPathPicker.cpp} |  4 +-
 ...loyerpathpicker.h => DeployerPathPicker.h} |  5 +-
 ...yerpathpicker.ui => DeployerPathPicker.ui} |  0
 .../{prefabdialog.cpp => PrefabDialog.cpp}    |  4 +-
 .../{prefabdialog.h => PrefabDialog.h}        |  5 +-
 .../{prefabdialog.ui => PrefabDialog.ui}      |  0
 ...bviewelement.cpp => PrefabViewElement.cpp} |  6 +-
 ...refabviewelement.h => PrefabViewElement.h} |  7 +-
 ...fabviewelement.ui => PrefabViewElement.ui} |  0
 ...wardhubmodule.cpp => SkywardHubModule.cpp} | 16 ++--
 ...{skywardhubmodule.h => SkywardHubModule.h} |  7 +-
 ...kywardhubmodule.ui => SkywardHubModule.ui} |  0
 ...kywardhubstrings.h => SkywardHubStrings.h} |  5 +-
 src/shared/Modules/Splitter/Splitter.cpp      |  4 +-
 src/shared/Modules/Splitter/Splitter.h        |  4 +-
 .../Modules/StateViewer/StateViewer.cpp       |  4 +-
 src/shared/Modules/StateViewer/StateViewer.h  | 11 +--
 .../Tabs/{tabsmodule.cpp => TabsModule.cpp}   |  4 +-
 .../Tabs/{tabsmodule.h => TabsModule.h}       |  7 +-
 .../Test/{testmodule.cpp => TestModule.cpp}   | 10 +--
 .../Test/{testmodule.h => TestModule.h}       |  7 +-
 .../Test/{testmodule.ui => TestModule.ui}     |  0
 ...ermodule.cpp => TimerControllerModule.cpp} |  4 +-
 ...rollermodule.h => TimerControllerModule.h} |  7 +-
 ...llermodule.ui => TimerControllerModule.ui} |  0
 .../{valueelement.cpp => ValueElement.cpp}    |  2 +-
 .../{valueelement.h => ValueElement.h}        |  7 +-
 ...le.cpp => ValuesConverterViewerModule.cpp} | 10 +--
 ...module.h => ValuesConverterViewerModule.h} | 11 +--
 ...dule.ui => ValuesConverterViewerModule.ui} |  0
 ...gpanel.cpp => ValuesViewerConfigPanel.cpp} |  4 +-
 ...onfigpanel.h => ValuesViewerConfigPanel.h} |  7 +-
 ...figpanel.ui => ValuesViewerConfigPanel.ui} |  0
 126 files changed, 336 insertions(+), 469 deletions(-)
 rename src/shared/Components/ContextMenuSeparator/{contextmenuseparator.cpp => ContextMenuSeparator.cpp} (95%)
 rename src/shared/Components/ContextMenuSeparator/{contextmenuseparator.h => ContextMenuSeparator.h} (81%)
 rename src/shared/Components/ErrorDisplayer/{error.cpp => Error.cpp} (98%)
 rename src/shared/Components/ErrorDisplayer/{error.h => Error.h} (83%)
 rename src/shared/Components/ErrorDisplayer/{errordisplayer.cpp => ErrorDisplayer.cpp} (97%)
 rename src/shared/Components/ErrorDisplayer/{errordisplayer.h => ErrorDisplayer.h} (85%)
 rename src/shared/Components/ModulesPicker/{modulespicker.cpp => ModulesPicker.cpp} (97%)
 rename src/shared/Components/ModulesPicker/{modulespicker.h => ModulesPicker.h} (90%)
 rename src/shared/Components/ModulesPicker/{modulespicker.ui => ModulesPicker.ui} (100%)
 rename src/shared/Components/SaveConfigurationDialog/{saveconfigurationdialog.cpp => SaveConfigurationDialog.cpp} (96%)
 rename src/shared/Components/SaveConfigurationDialog/{saveconfigurationdialog.h => SaveConfigurationDialog.h} (88%)
 rename src/shared/Components/SaveConfigurationDialog/{saveconfigurationdialog.ui => SaveConfigurationDialog.ui} (100%)
 rename src/shared/Components/SubscriptionsPanel/{subscriptionspanel.cpp => SubscriptionsPanel.cpp} (94%)
 rename src/shared/Components/SubscriptionsPanel/{subscriptionspanel.h => SubscriptionsPanel.h} (84%)
 rename src/shared/Components/SubscriptionsPanel/{subscriptionspanel.ui => SubscriptionsPanel.ui} (100%)
 rename src/shared/Components/ToggleButton/{togglebutton.cpp => ToggleButton.cpp} (99%)
 rename src/shared/Components/ToggleButton/{togglebutton.h => ToggleButton.h} (93%)
 rename src/shared/Components/TopicAndFieldFilterSelector/{topicandfieldfilterselector.cpp => TopicAndFieldFilterSelector.cpp} (98%)
 rename src/shared/Components/TopicAndFieldFilterSelector/{topicandfieldfilterselector.h => TopicAndFieldFilterSelector.h} (76%)
 rename src/shared/Components/TopicFilterSelector/{topicfilterselector.cpp => TopicFilterSelector.cpp} (98%)
 rename src/shared/Components/TopicFilterSelector/{topicfilterselector.h => TopicFilterSelector.h} (76%)
 rename src/shared/Core/Message/{messagefield.cpp => MessageField.cpp} (99%)
 rename src/shared/Core/Message/{messagefield.h => MessageField.h} (95%)
 rename src/shared/Core/Message/{modulemessage.cpp => ModuleMessage.cpp} (98%)
 rename src/shared/Core/Message/{modulemessage.h => ModuleMessage.h} (88%)
 rename src/shared/Core/Message/{topic.cpp => Topic.cpp} (97%)
 rename src/shared/Core/Message/{topic.h => Topic.h} (100%)
 rename src/shared/Core/Message/{topicandfieldfilter.cpp => TopicAndFieldFilter.cpp} (98%)
 rename src/shared/Core/Message/{topicandfieldfilter.h => TopicAndFieldFilter.h} (89%)
 rename src/shared/Core/Message/{topicfilter.cpp => TopicFilter.cpp} (98%)
 rename src/shared/Core/Message/{topicfilter.h => TopicFilter.h} (98%)
 rename src/shared/Core/{module.cpp => Module.cpp} (90%)
 rename src/shared/Core/{module.h => Module.h} (80%)
 rename src/shared/Core/{moduleeventshandler.cpp => ModuleEventsHandler.cpp} (58%)
 rename src/shared/Core/{moduleeventshandler.h => ModuleEventsHandler.h} (79%)
 rename src/shared/Core/{modulemessagesbroker.cpp => ModuleMessagesBroker.cpp} (95%)
 rename src/shared/Core/{modulemessagesbroker.h => ModuleMessagesBroker.h} (83%)
 rename src/shared/Core/{modulesmanager.cpp => ModulesManager.cpp} (96%)
 rename src/shared/Core/{modulesmanager.h => ModulesManager.h} (93%)
 rename src/shared/Core/{skywardhubcore.cpp => SkywardHubCore.cpp} (94%)
 rename src/shared/Core/{skywardhubcore.h => SkywardHubCore.h} (87%)
 rename src/shared/Core/{xmlobject.cpp => XmlObject.cpp} (99%)
 rename src/shared/Core/{xmlobject.h => XmlObject.h} (97%)
 rename src/shared/Modules/DefaultModule/{defaultmodule.cpp => DefaultModule.cpp} (96%)
 rename src/shared/Modules/DefaultModule/{defaultmodule.h => DefaultModule.h} (84%)
 rename src/shared/Modules/Empty/{emptymodule.cpp => EmptyModule.cpp} (82%)
 rename src/shared/Modules/Empty/{emptymodule.h => EmptyModule.h} (77%)
 rename src/shared/Modules/Empty/{emptymodule.ui => EmptyModule.ui} (100%)
 rename src/shared/Modules/FileStream/{filestreammodule.cpp => FileStreamModule.cpp} (97%)
 rename src/shared/Modules/FileStream/{filestreammodule.h => FileStreamModule.h} (85%)
 rename src/shared/Modules/FileStream/{filestreammodule.ui => FileStreamModule.ui} (100%)
 rename src/shared/Modules/IncomingMessagesViewer/{incomingmessagesviewermodule.cpp => IncomingMessagesViewerModule.cpp} (98%)
 rename src/shared/Modules/IncomingMessagesViewer/{incomingmessagesviewermodule.h => IncomingMessagesViewerModule.h} (77%)
 rename src/shared/Modules/MainWindow/{skywardhubmainwindow.cpp => SkywardHubMainWindow.cpp} (93%)
 rename src/shared/Modules/MainWindow/{skywardhubmainwindow.h => SkywardHubMainWindow.h} (69%)
 rename src/shared/Modules/MainWindow/{window.cpp => Window.cpp} (94%)
 rename src/shared/Modules/MainWindow/{window.h => Window.h} (80%)
 rename src/shared/Modules/MainWindow/{window.ui => Window.ui} (100%)
 rename src/shared/Modules/Mavlink/{mavlinkcommandadapter.cpp => MavlinkCommandAdapter.cpp} (96%)
 rename src/shared/Modules/Mavlink/{mavlinkcommandadapter.h => MavlinkCommandAdapter.h} (75%)
 rename src/shared/Modules/Mavlink/{mavlinkmodule.cpp => MavlinkModule.cpp} (97%)
 rename src/shared/Modules/Mavlink/{mavlinkmodule.h => MavlinkModule.h} (81%)
 rename src/shared/Modules/Mavlink/{mavlinkreader.cpp => MavlinkReader.cpp} (98%)
 rename src/shared/Modules/Mavlink/{mavlinkreader.h => MavlinkReader.h} (87%)
 rename src/shared/Modules/Mavlink/{mavlinkrocketmsgtestingmodule.cpp => MavlinkRocketMsgTestingModule.cpp} (97%)
 rename src/shared/Modules/Mavlink/{mavlinkrocketmsgtestingmodule.h => MavlinkRocketMsgTestingModule.h} (90%)
 rename src/shared/Modules/Mavlink/{mavlinkrocketmsgtestingmodule.ui => MavlinkRocketMsgTestingModule.ui} (100%)
 rename src/shared/Modules/Mavlink/{mavlinkversionheader.h => MavlinkVersionHeader.h} (76%)
 rename src/shared/Modules/Mavlink/{mavlinkwriter.cpp => MavlinkWriter.cpp} (95%)
 rename src/shared/Modules/Mavlink/{mavlinkwriter.h => MavlinkWriter.h} (72%)
 rename src/shared/Modules/{moduleinfo.cpp => ModuleInfo.cpp} (98%)
 rename src/shared/Modules/{moduleinfo.h => ModuleInfo.h} (95%)
 rename src/shared/Modules/{moduleslist.cpp => ModulesList.cpp} (92%)
 rename src/shared/Modules/{moduleslist.h => ModulesList.h} (84%)
 rename src/shared/Modules/OutgoingMessagesViewer/{outgoingmessagesviewermodule.cpp => OutgoingMessagesViewerModule.cpp} (96%)
 rename src/shared/Modules/OutgoingMessagesViewer/{outgoingmessagesviewermodule.h => OutgoingMessagesViewerModule.h} (83%)
 rename src/shared/Modules/OutgoingMessagesViewer/{outgoingmessagesviewermodule.ui => OutgoingMessagesViewerModule.ui} (100%)
 rename src/shared/Modules/SkywardHub/{deployer.cpp => Deployer.cpp} (99%)
 rename src/shared/Modules/SkywardHub/{deployer.h => Deployer.h} (93%)
 rename src/shared/Modules/SkywardHub/{deployerpathpicker.cpp => DeployerPathPicker.cpp} (97%)
 rename src/shared/Modules/SkywardHub/{deployerpathpicker.h => DeployerPathPicker.h} (88%)
 rename src/shared/Modules/SkywardHub/{deployerpathpicker.ui => DeployerPathPicker.ui} (100%)
 rename src/shared/Modules/SkywardHub/{prefabdialog.cpp => PrefabDialog.cpp} (97%)
 rename src/shared/Modules/SkywardHub/{prefabdialog.h => PrefabDialog.h} (84%)
 rename src/shared/Modules/SkywardHub/{prefabdialog.ui => PrefabDialog.ui} (100%)
 rename src/shared/Modules/SkywardHub/{prefabviewelement.cpp => PrefabViewElement.cpp} (96%)
 rename src/shared/Modules/SkywardHub/{prefabviewelement.h => PrefabViewElement.h} (92%)
 rename src/shared/Modules/SkywardHub/{prefabviewelement.ui => PrefabViewElement.ui} (100%)
 rename src/shared/Modules/SkywardHub/{skywardhubmodule.cpp => SkywardHubModule.cpp} (97%)
 rename src/shared/Modules/SkywardHub/{skywardhubmodule.h => SkywardHubModule.h} (93%)
 rename src/shared/Modules/SkywardHub/{skywardhubmodule.ui => SkywardHubModule.ui} (100%)
 rename src/shared/Modules/{skywardhubstrings.h => SkywardHubStrings.h} (96%)
 rename src/shared/Modules/Tabs/{tabsmodule.cpp => TabsModule.cpp} (99%)
 rename src/shared/Modules/Tabs/{tabsmodule.h => TabsModule.h} (89%)
 rename src/shared/Modules/Test/{testmodule.cpp => TestModule.cpp} (90%)
 rename src/shared/Modules/Test/{testmodule.h => TestModule.h} (82%)
 rename src/shared/Modules/Test/{testmodule.ui => TestModule.ui} (100%)
 rename src/shared/Modules/TimerController/{timercontrollermodule.cpp => TimerControllerModule.cpp} (98%)
 rename src/shared/Modules/TimerController/{timercontrollermodule.h => TimerControllerModule.h} (88%)
 rename src/shared/Modules/TimerController/{timercontrollermodule.ui => TimerControllerModule.ui} (100%)
 rename src/shared/Modules/ValuesConverterViewer/{valueelement.cpp => ValueElement.cpp} (99%)
 rename src/shared/Modules/ValuesConverterViewer/{valueelement.h => ValueElement.h} (93%)
 rename src/shared/Modules/ValuesConverterViewer/{valuesconverterviewermodule.cpp => ValuesConverterViewerModule.cpp} (96%)
 rename src/shared/Modules/ValuesConverterViewer/{valuesconverterviewermodule.h => ValuesConverterViewerModule.h} (83%)
 rename src/shared/Modules/ValuesConverterViewer/{valuesconverterviewermodule.ui => ValuesConverterViewerModule.ui} (100%)
 rename src/shared/Modules/ValuesConverterViewer/{valuesviewerconfigpanel.cpp => ValuesViewerConfigPanel.cpp} (98%)
 rename src/shared/Modules/ValuesConverterViewer/{valuesviewerconfigpanel.h => ValuesViewerConfigPanel.h} (89%)
 rename src/shared/Modules/ValuesConverterViewer/{valuesviewerconfigpanel.ui => ValuesViewerConfigPanel.ui} (100%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5be4d54f..f9a655bb 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 078a34d5..10e3c7db 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 3a9bbd43..7adc02c8 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 466a9722..3e1085a1 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 66f93e53..9c7fa69c 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 a7dd6445..75ade719 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 16a0571a..085c88d7 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 f2d499ea..39a5669f 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 6324f1c8..8f65b7f6 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 3ade6c0d..61c1fc93 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 53c3ee59..ad65edfd 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 fe051627..8c51e3c6 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 b2f7433f..1b261b29 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 4db9d323..42ca6d6c 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 44be8d54..cc040729 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 bd29a3e8..2e0d8597 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 339bd2ee..47a6b3f2 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 5c036598..880074ea 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 5bfdc553..5e1c0e73 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 4b4aae6c..643a7b6a 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 577c8206..158eb722 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 f1619349..4be8bb4e 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 edc82a13..cf5497dc 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 1280c52e..cbb1d9eb 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 c35f98c4..19209574 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 820ff406..cbae6d08 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 ac0d4464..fb6929f7 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 3d710ea4..a93a7b92 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 313cf56c..4331bea8 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 32c67c9f..2b184250 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 ce1ef9a7..9fbfc96d 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 7c4dd91d..9c76e7e2 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 d10a0727..173b89ea 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 87fdc30c..ea224262 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 0d7e6253..3fdc4bff 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 165adba8..056b4792 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 54f7b5ac..3733f662 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 4288010b..620265c3 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 90676021..44e767d1 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 33fd2723..dbc0891a 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 ccc724a4..528fe3fc 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 9a0ec8c6..06f9e3e9 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 22080dbc..7f13cea3 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 25b37d9d..4a0c6819 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 e372e6de..5d3fb295 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 cc496148..dc736fbd 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 fab2bf58..34c60ef2 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 1215f0f7..d8d16e57 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 95da8691..6dba4910 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 4252e2cb..4ef3be86 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 2bcb311c..900a1a16 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 a2266aa4..9f30cdc3 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 098dad04..f9e544b4 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 15b32437..df01964b 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 8025d5f6..63693c28 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 b95820bb..6054cc84 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 39ea093e..914dc831 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 041cede4..dacb40a9 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 28b4297e..e2e985a8 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 66b4f07b..03b4cdce 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 9e2ff42e..6d08441b 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 8c2683aa..f10f30d2 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 e04516a8..49b50cb1 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 8872c76b..2d9312fb 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 58c4909d..ccd7a12b 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 9a7b269e..a26014ab 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 7d7bd59c..7704c4c8 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 e64b54ad..2243200e 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 1d59c2e6..560bc056 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 a9b7c014..22d29830 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 0822fd00..83decea7 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 6736b8a1..f7a06fec 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 3ec786b9..cd0a11da 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 4bfef20e..910e71aa 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 8b3d4489..0e76b338 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 5758d087..a3613be2 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 76b29257..e153fc7b 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 6076b53a..93fd7ef3 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 ccb0702c..3238d6b0 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 a14d7657..b7192d3e 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 f4228baf..17a43ea2 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 4a6c2c4f..48204d3c 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 f7f5529e..772f9e44 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 8afcb0b1..6a33e95a 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 b83406c4..69531a0c 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 294cc24e..0a16cc96 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 f649c3fb..462baa0b 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 ab85fdf5..0e4083fd 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 906c7b44..75352d64 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 4819de4e..0b443d7d 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 7ef12dcd..e46b4b50 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 a20706f4..8bdaba70 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 b8b8c6c9..330c6f87 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 abce604e..dc08eb76 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 ef309a7b..f7a1f6bd 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 aa263af5..f80aaa5a 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 0ae00252..194d574a 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 2ab44281..c3092fc9 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 6cc741b6..fc181e8d 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 51dfce3b..b9eec753 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 f6e51c0d..8de16e6d 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 ada4cc41..abc76bab 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 1aeb7eeb..f1d2d1db 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 31d3f425..1aea8bc4 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 a166d437..4075e5ba 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 fc6e0f0b..297de750 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 53a8543e..432928f0 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 6fbfa975..5a014a4b 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 d0f988ec..de81e351 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
-- 
GitLab