diff --git a/Modules/MessageViewer/messagesviewermodule.cpp b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp
similarity index 73%
rename from Modules/MessageViewer/messagesviewermodule.cpp
rename to Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp
index 6247bf2ab6817150f813acfa0c4a206018eca5af..76dbcd516d5c03116f498397f54f224edf6f6a88 100644
--- a/Modules/MessageViewer/messagesviewermodule.cpp
+++ b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp
@@ -1,11 +1,11 @@
-#include "messagesviewermodule.h"
-#include "ui_messagesviewermodule.h"
+#include "outcomingmessagesviewermodule.h"
+#include "ui_outcomingmessagesviewermodule.h"
 
 #include "Core/modulemessagesbroker.h"
 #include "Modules/skywardhubstrings.h"
 #include <QTableWidgetItem>
 
-MessagesViewerModule::MessagesViewerModule(QWidget* parent) : DefaultModule(parent), ui(new Ui::MessagesViewerModule) {
+OutcomingMessagesViewerModule::OutcomingMessagesViewerModule(QWidget* parent) : DefaultModule(parent), ui(new Ui::OutcomingMessagesViewerModule) {
     ui->setupUi(this);
     defaultContextMenuSetup();
 
@@ -18,23 +18,23 @@ MessagesViewerModule::MessagesViewerModule(QWidget* parent) : DefaultModule(pare
     });
 }
 
-MessagesViewerModule::~MessagesViewerModule() {
+OutcomingMessagesViewerModule::~OutcomingMessagesViewerModule() {
     delete ui;
 }
 
-QWidget* MessagesViewerModule::toWidget() {
+QWidget* OutcomingMessagesViewerModule::toWidget() {
     return this;
 }
 
-XmlObject MessagesViewerModule::toXmlObject() {
-    return XmlObject(getName(ModuleId::MESSAGEVIEWER));
+XmlObject OutcomingMessagesViewerModule::toXmlObject() {
+    return XmlObject(getName(ModuleId::OUTCOMINGMESSAGEVIEWER));
 }
 
-void MessagesViewerModule::fromXmlObject(const XmlObject& xmlObject) {
+void OutcomingMessagesViewerModule::fromXmlObject(const XmlObject& xmlObject) {
     Q_UNUSED(xmlObject);
 }
 
-void MessagesViewerModule::addMsgSent(const ModuleMessage& msg) {
+void OutcomingMessagesViewerModule::addMsgSent(const ModuleMessage& msg) {
     int row = updateVerticalHeaders(msg);
     int column = 0;
 
@@ -46,11 +46,11 @@ void MessagesViewerModule::addMsgSent(const ModuleMessage& msg) {
     registerMessage(newItem, msg);
 }
 
-QString MessagesViewerModule::computeMsgName(const ModuleMessage& msg) {
+QString OutcomingMessagesViewerModule::computeMsgName(const ModuleMessage& msg) {
     return msg.getTopic().toString().replace(SkywardHubStrings::commandsTopic + "/", "");
 }
 
-void MessagesViewerModule::handleAck(const ModuleMessage& ack) {
+void OutcomingMessagesViewerModule::handleAck(const ModuleMessage& ack) {
     for(int i = 0; i < messages.count(); i++) {
         ModuleMessage msg = messages[i].getMsg();
 
@@ -65,7 +65,7 @@ void MessagesViewerModule::handleAck(const ModuleMessage& ack) {
     }
 }
 
-int MessagesViewerModule::updateVerticalHeaders(const ModuleMessage& msg) {
+int OutcomingMessagesViewerModule::updateVerticalHeaders(const ModuleMessage& msg) {
     int row = 0; // Insert on top
     QTime time(0, 0, 0, 0);
     time = time.addMSecs(msg.getField("timestamp").getInteger(0));
@@ -83,7 +83,7 @@ int MessagesViewerModule::updateVerticalHeaders(const ModuleMessage& msg) {
     return row;
 }
 
-void MessagesViewerModule::registerMessage(QTableWidgetItem* item, const ModuleMessage& msg) {
+void OutcomingMessagesViewerModule::registerMessage(QTableWidgetItem* item, const ModuleMessage& msg) {
     messages.prepend(MessageLog(item, msg));
     if(messages.count() > maxSize) {
         messages.removeLast();
diff --git a/Modules/MessageViewer/messagesviewermodule.h b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h
similarity index 75%
rename from Modules/MessageViewer/messagesviewermodule.h
rename to Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h
index 5d7cc4fac1641113a6931a2d9f453ac98e3edfeb..92966fa2c740e659a603188a01a0d3253228c4a3 100644
--- a/Modules/MessageViewer/messagesviewermodule.h
+++ b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h
@@ -1,5 +1,5 @@
-#ifndef MESSAGESVIEWERMODULE_H
-#define MESSAGESVIEWERMODULE_H
+#ifndef OUTCOMINGMESSAGESVIEWERMODULE_H
+#define OUTCOMINGMESSAGESVIEWERMODULE_H
 
 #include <QWidget>
 #include "Core/module.h"
@@ -26,15 +26,15 @@ class MessageLog {
 
 
 namespace Ui {
-class MessagesViewerModule;
+class OutcomingMessagesViewerModule;
 }
 
-class MessagesViewerModule : public DefaultModule {
+class OutcomingMessagesViewerModule : public DefaultModule {
     Q_OBJECT
 
   public:
-    explicit MessagesViewerModule(QWidget* parent = nullptr);
-    ~MessagesViewerModule();
+    explicit OutcomingMessagesViewerModule(QWidget* parent = nullptr);
+    ~OutcomingMessagesViewerModule();
 
     QWidget* toWidget() override;
 
@@ -50,10 +50,10 @@ class MessagesViewerModule : public DefaultModule {
     QString computeMsgName(const ModuleMessage& msg);
 
   private:
-    Ui::MessagesViewerModule* ui;
+    Ui::OutcomingMessagesViewerModule* ui;
     QList<MessageLog> messages;
     QString ackTopic = SkywardHubStrings::mavlink_received_msg_ACK_topic;
     int maxSize = 10;
 };
 
-#endif // MESSAGESVIEWERMODULE_H
+#endif // OUTCOMINGMESSAGESVIEWERMODULE_H
diff --git a/Modules/MessageViewer/messagesviewermodule.ui b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui
similarity index 89%
rename from Modules/MessageViewer/messagesviewermodule.ui
rename to Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui
index 96895b985e7d8c4ef1b112de80f486f7a47b0b2e..519b4e5f384f0b142b8ca1531e60ea18f2f922c9 100644
--- a/Modules/MessageViewer/messagesviewermodule.ui
+++ b/Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MessagesViewerModule</class>
- <widget class="QWidget" name="MessagesViewerModule">
+ <class>OutcomingMessagesViewerModule</class>
+ <widget class="QWidget" name="OutcomingMessagesViewerModule">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/Modules/moduleinfo.h b/Modules/moduleinfo.h
index d830b71328fde986627a81a3402dbacbd9d98cde..78e2c76d279a2e7675eb660a3fa9132eee1fa0da 100644
--- a/Modules/moduleinfo.h
+++ b/Modules/moduleinfo.h
@@ -14,7 +14,7 @@ enum ModuleId {
     BROKERTEST,
     GRAPH,
     TABLE,
-    MESSAGEVIEWER,
+    OUTCOMINGMESSAGEVIEWER,
     MAVLINK,
     FSMVIEWER,
     TREEVIEWER,
diff --git a/Modules/moduleslist.cpp b/Modules/moduleslist.cpp
index 3e2909013839098174db57388beac575eab20d15..89ca2b4e2d3a0ab6480e5dcf286740d60cbc6fb5 100644
--- a/Modules/moduleslist.cpp
+++ b/Modules/moduleslist.cpp
@@ -8,7 +8,7 @@
 #include "Modules/SkywardHub/skywardhubmodule.h"
 #include "Modules/Test/testmodule.h"
 #include "Modules/Graph/graphmodule.h"
-#include "Modules/MessageViewer/messagesviewermodule.h"
+#include "Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h"
 #include "Modules/Mavlink/mavlinkmodule.h"
 #include "Modules/FileStream/filestreammodule.h"
 #include "Modules/Mavlink/mavlinkrocketmsgtestingmodule.h"
@@ -76,12 +76,12 @@ void ModulesList::createModuleList() {
     addModuleInfo(graphModule);
 #endif
 
-#ifdef MESSAGESVIEWERMODULE_H
-    ModuleInfo msgViewer(ModuleId::MESSAGEVIEWER, "MessageViewer", ModuleCategory::DATAVISUAL);
+#ifdef OUTCOMINGMESSAGESVIEWERMODULE_H
+    ModuleInfo msgViewer(ModuleId::OUTCOMINGMESSAGEVIEWER, "OutcomingMessagesViewer", ModuleCategory::DATAVISUAL);
     msgViewer.setFactory([]() {
-        return new MessagesViewerModule();
+        return new OutcomingMessagesViewerModule();
     });
-    msgViewer.addModuleSourceFiles("Modules/MessageViewer/");
+    msgViewer.addModuleSourceFiles("Modules/OutcomingMessageViewer/");
     addModuleInfo(msgViewer);
 #endif
 
diff --git a/SkywardHub.pro b/SkywardHub.pro
index 2195a5e7d252a394de5f93a9bfe17472ec7d0f70..50abaad49764e3a06e5dc0d1cc5b51fa6cddf7f2 100644
--- a/SkywardHub.pro
+++ b/SkywardHub.pro
@@ -41,7 +41,7 @@ SOURCES += \
     Modules/Mavlink/mavlinkreader.cpp \
     Modules/Mavlink/mavlinkrocketmsgtestingmodule.cpp \
     Modules/Mavlink/mavlinkwriter.cpp \
-    Modules/MessageViewer/messagesviewermodule.cpp \
+    Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.cpp \
     Modules/SkywardHub/deployer.cpp \
     Modules/SkywardHub/deployerpathpicker.cpp \
     Modules/SkywardHub/prefabdialog.cpp \
@@ -94,7 +94,7 @@ HEADERS += \
     Modules/Mavlink/mavlinkversionheader.h \
     Modules/Mavlink/mavlinkversionheader.h \
     Modules/Mavlink/mavlinkwriter.h \
-    Modules/MessageViewer/messagesviewermodule.h \
+    Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.h \
     Modules/SkywardHub/deployer.h \
     Modules/SkywardHub/deployerpathpicker.h \
     Modules/SkywardHub/prefabdialog.h \
@@ -123,7 +123,7 @@ FORMS += \
     Modules/MainWindow/window.ui \
     Modules/Mavlink/mavlinkmodule.ui \
     Modules/Mavlink/mavlinkrocketmsgtestingmodule.ui \
-    Modules/MessageViewer/messagesviewermodule.ui \
+    Modules/OutcomingMessagesViewer/outcomingmessagesviewermodule.ui \
     Modules/SkywardHub/deployerpathpicker.ui \
     Modules/SkywardHub/prefabdialog.ui \
     Modules/SkywardHub/prefabviewelement.ui \