diff --git a/src/Groundstation/Automated/Actuators/Actuators.h b/src/Groundstation/Automated/Actuators/Actuators.h
index 0d457b1af7b15c5b796d715ad9ca2758f13a5ba8..f394206b8d90de329011923c0a7b7c16e1aea70d 100644
--- a/src/Groundstation/Automated/Actuators/Actuators.h
+++ b/src/Groundstation/Automated/Actuators/Actuators.h
@@ -21,7 +21,7 @@
  */
 #pragma once
 
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <logger/Logger.h>
 #include <utils/DependencyManager/DependencyManager.h>
 
diff --git a/src/Groundstation/Automated/Hub.cpp b/src/Groundstation/Automated/Hub.cpp
index f16bfaa0ff0bf959b36045aa6f2a09da5cb6e3c7..ea792e544ca0a512f5632d2d4b25aa736af7a709 100644
--- a/src/Groundstation/Automated/Hub.cpp
+++ b/src/Groundstation/Automated/Hub.cpp
@@ -30,7 +30,7 @@
 #include <Groundstation/LyraGS/Radio/Radio.h>
 #include <algorithms/NAS/NASState.h>
 #include <common/Events.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <diagnostic/CpuMeter/CpuMeter.h>
 #include <logger/Logger.h>
 #include <sensors/SensorData.h>
diff --git a/src/Groundstation/Automated/Hub.h b/src/Groundstation/Automated/Hub.h
index a61b174e89b8bbab7788287d2c11da112aef3c93..06fe4ee39bf2ffb490353548eaf256ecb6244094 100644
--- a/src/Groundstation/Automated/Hub.h
+++ b/src/Groundstation/Automated/Hub.h
@@ -31,7 +31,7 @@
 #include <Groundstation/LyraGS/Ports/SerialLyraGS.h>
 #include <Groundstation/LyraGS/Radio/Radio.h>
 #include <algorithms/NAS/NASState.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <miosix.h>
 #include <sensors/SensorData.h>
 #include <utils/DependencyManager/DependencyManager.h>
diff --git a/src/Groundstation/Common/Config/GeneralConfig.h b/src/Groundstation/Common/Config/GeneralConfig.h
index 0cbd6a431f167ce45d416728968fc5129ef2fd8f..04268edd18ffc97ea172a243cbaa9e7d02e8ab21 100644
--- a/src/Groundstation/Common/Config/GeneralConfig.h
+++ b/src/Groundstation/Common/Config/GeneralConfig.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 
 #include <cstdint>
 namespace Groundstation
diff --git a/src/Groundstation/Common/HubBase.h b/src/Groundstation/Common/HubBase.h
index 8118bd296b38cffec333eac00e08dedd9551aab4..a6bcc028ade4e2dc6f14a7c68dc6a46b643583ca 100644
--- a/src/Groundstation/Common/HubBase.h
+++ b/src/Groundstation/Common/HubBase.h
@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <utils/DependencyManager/DependencyManager.h>
 
 namespace Groundstation
diff --git a/src/Groundstation/Common/Ports/EthernetBase.h b/src/Groundstation/Common/Ports/EthernetBase.h
index 57e6622e50e7be804694ae030ecf4afc25df5104..8e9642da88df9afdb7b69aa64f7c12a90a605f6a 100644
--- a/src/Groundstation/Common/Ports/EthernetBase.h
+++ b/src/Groundstation/Common/Ports/EthernetBase.h
@@ -25,7 +25,7 @@
 #include <ActiveObject.h>
 #include <Groundstation/Common/HubBase.h>
 #include <Groundstation/Common/Ports/EthernetSniffer.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <drivers/WIZ5500/WIZ5500.h>
 #include <radio/MavlinkDriver/MavlinkDriver.h>
 #include <utils/DependencyManager/DependencyManager.h>
diff --git a/src/Groundstation/Common/Ports/EthernetSniffer.h b/src/Groundstation/Common/Ports/EthernetSniffer.h
index 7f4ea7a74340f2bd367d761b11c254f6117ca1e0..ada1edbd3cc2780aa6fea53c61a2d4e3daca0878 100644
--- a/src/Groundstation/Common/Ports/EthernetSniffer.h
+++ b/src/Groundstation/Common/Ports/EthernetSniffer.h
@@ -24,7 +24,7 @@
 
 #include <ActiveObject.h>
 #include <Groundstation/Common/HubBase.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <drivers/WIZ5500/WIZ5500.h>
 #include <radio/MavlinkDriver/MavlinkDriver.h>
 #include <utils/DependencyManager/DependencyManager.h>
diff --git a/src/Groundstation/Common/Ports/Serial.h b/src/Groundstation/Common/Ports/Serial.h
index 108625dcc35cd403ec35f0fca5317710261803f6..c154e33fea06caead0b113f8706243815cc934ca 100644
--- a/src/Groundstation/Common/Ports/Serial.h
+++ b/src/Groundstation/Common/Ports/Serial.h
@@ -24,7 +24,7 @@
 
 #include <ActiveObject.h>
 #include <Groundstation/Common/HubBase.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <filesystem/console/console_device.h>
 #include <radio/MavlinkDriver/MavlinkDriver.h>
 #include <utils/DependencyManager/DependencyManager.h>
diff --git a/src/Groundstation/Common/Radio/RadioBase.h b/src/Groundstation/Common/Radio/RadioBase.h
index 12d44d748eff31951ba83878a0fc690cf8661bb5..a18016b2ab7d8fcee007bce71a8e71a4d92e1ece 100644
--- a/src/Groundstation/Common/Radio/RadioBase.h
+++ b/src/Groundstation/Common/Radio/RadioBase.h
@@ -25,7 +25,7 @@
 #include <ActiveObject.h>
 #include <Groundstation/Common/Config/RadioConfig.h>
 #include <Groundstation/Common/HubBase.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <common/Radio.h>
 #include <radio/MavlinkDriver/MavlinkDriver.h>
 #include <radio/SX1278/SX1278Fsk.h>
diff --git a/src/Groundstation/LyraGS/Base/Hub.h b/src/Groundstation/LyraGS/Base/Hub.h
index d1040b642864cd91025c263aad120775a25905b6..b2c2eef15d2d66f58a8b5b5cea06915e26dba5bc 100644
--- a/src/Groundstation/LyraGS/Base/Hub.h
+++ b/src/Groundstation/LyraGS/Base/Hub.h
@@ -25,7 +25,7 @@
 #include <Groundstation/Common/HubBase.h>
 #include <Groundstation/LyraGS/Ports/Ethernet.h>
 #include <Groundstation/LyraGS/Ports/SerialLyraGS.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <utils/DependencyManager/DependencyManager.h>
 
 namespace GroundstationBase
diff --git a/src/Groundstation/LyraGS/BoardStatus.h b/src/Groundstation/LyraGS/BoardStatus.h
index 4d789f71a6896bb22002d07071417d4f08f5a805..97add60c54013fa8f107c1ae0994a64cc015f9a8 100644
--- a/src/Groundstation/LyraGS/BoardStatus.h
+++ b/src/Groundstation/LyraGS/BoardStatus.h
@@ -33,7 +33,7 @@
 #include <Groundstation/LyraGS/Ports/Ethernet.h>
 #include <Groundstation/LyraGS/Radio/Radio.h>
 #include <Groundstation/LyraGS/Radio/RadioData.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <drivers/timer/TimestampTimer.h>
 #include <utils/DependencyManager/DependencyManager.h>
 #include <utils/collections/CircularBuffer.h>
diff --git a/src/Groundstation/LyraGS/Ports/SerialLyraGS.h b/src/Groundstation/LyraGS/Ports/SerialLyraGS.h
index 5f926c036d927ac44e2521fc3fa60d489dcc6d95..6681d80b25d052e3a25c98e54531188250dc6916 100644
--- a/src/Groundstation/LyraGS/Ports/SerialLyraGS.h
+++ b/src/Groundstation/LyraGS/Ports/SerialLyraGS.h
@@ -27,7 +27,7 @@
 #include <Groundstation/Common/Ports/Serial.h>
 #include <Groundstation/LyraGS/BoardStatus.h>
 #include <Groundstation/LyraGS/Buses.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <drivers/usart/USART.h>
 #include <filesystem/console/console_device.h>
 #include <radio/MavlinkDriver/MavlinkDriver.h>
diff --git a/src/Groundstation/Nokia/Hub.h b/src/Groundstation/Nokia/Hub.h
index 15c641ccb9e122a1b7f92d3e769477979f550d5e..879d5810c973a225620eedca5e6aa5fd39f3c702 100644
--- a/src/Groundstation/Nokia/Hub.h
+++ b/src/Groundstation/Nokia/Hub.h
@@ -25,7 +25,7 @@
 #include <Groundstation/Common/HubBase.h>
 #include <Groundstation/Common/Ports/Serial.h>
 #include <Groundstation/Nokia/Radio/Radio.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <utils/DependencyManager/DependencyManager.h>
 
 namespace GroundstationNokia
diff --git a/src/Groundstation/RotatingPlatform/BoardStatus.h b/src/Groundstation/RotatingPlatform/BoardStatus.h
index e6e0d2aa2b42b129a6afae88909c7650c9271f5c..2395a80fe193ab5e552d57c5b5b676d45fba78bd 100644
--- a/src/Groundstation/RotatingPlatform/BoardStatus.h
+++ b/src/Groundstation/RotatingPlatform/BoardStatus.h
@@ -31,7 +31,7 @@
 #include <Groundstation/LyraGS/Radio/Radio.h>
 #include <Groundstation/LyraGS/Radio/RadioData.h>
 #include <Groundstation/RotatingPlatform/Actuators/Actuators.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <drivers/timer/TimestampTimer.h>
 #include <utils/DependencyManager/DependencyManager.h>
 #include <utils/collections/CircularBuffer.h>
diff --git a/src/Groundstation/Rovie/Hub.h b/src/Groundstation/Rovie/Hub.h
index 4aa25089ba3981008aa8fe3901948dce7326ed87..b5b396a666d10ae1fc11d870ef17ff5440721110 100644
--- a/src/Groundstation/Rovie/Hub.h
+++ b/src/Groundstation/Rovie/Hub.h
@@ -26,7 +26,7 @@
 #include <Groundstation/Common/Ports/Serial.h>
 #include <Groundstation/Rovie/Ports/Ethernet.h>
 #include <Groundstation/Rovie/Radio/Radio.h>
-#include <common/MavlinkLyra.h>
+#include <common/MavlinkOrion.h>
 #include <utils/DependencyManager/DependencyManager.h>
 
 namespace GroundstationRovie