diff --git a/libs/mavlink-skyward-lib b/libs/mavlink-skyward-lib
index 78a568f5e31fb9b50dbf8ec7d9af16261b364a8f..03d37888f7b5a84b5032ca1af392a16da7f39df2 160000
--- a/libs/mavlink-skyward-lib
+++ b/libs/mavlink-skyward-lib
@@ -1 +1 @@
-Subproject commit 78a568f5e31fb9b50dbf8ec7d9af16261b364a8f
+Subproject commit 03d37888f7b5a84b5032ca1af392a16da7f39df2
diff --git a/src/shared/Modules/CommandPad/MessagesList.h b/src/shared/Modules/CommandPad/MessagesList.h
index 90e8163613ed93d65d72565ef013a16d4f9467bc..693440bcb63a0252b08101ad4ca257ac318ca384 100644
--- a/src/shared/Modules/CommandPad/MessagesList.h
+++ b/src/shared/Modules/CommandPad/MessagesList.h
@@ -171,15 +171,15 @@ const QMap<QString, int> servosList{
     {"EXPULSION_SERVO", EXPULSION_SERVO},
     {"PARAFOIL_LEFT_SERVO", PARAFOIL_LEFT_SERVO},
     {"PARAFOIL_RIGHT_SERVO", PARAFOIL_RIGHT_SERVO},
-    {"N2O_FILLING_VALVE", N2O_FILLING_VALVE},
-    {"N2O_RELEASE_VALVE", N2O_RELEASE_VALVE},
-    {"N2O_DETATCH_SERVO", N2O_DETACH_SERVO},
-    {"N2O_VENTING_VALVE", N2O_VENTING_VALVE},
+    {"OX_FILLING_VALVE", OX_FILLING_VALVE},
+    {"OX_RELEASE_VALVE", OX_RELEASE_VALVE},
+    {"OX_DETACH_SERVO", OX_DETACH_SERVO},
+    {"OX_VENTING_VALVE", OX_VENTING_VALVE},
     {"N2_FILLING_VALVE", N2_FILLING_VALVE},
     {"N2_RELEASE_VALVE", N2_RELEASE_VALVE},
     {"N2_DETACH_SERVO", N2_DETACH_SERVO},
     {"N2_QUENCHING_VALVE", N2_QUENCHING_VALVE},
-    {"N2_3WAY_VALVE", N2_3WAY_VAVLE},
+    {"N2_3WAY_VALVE", N2_3WAY_VALVE},
     {"MAIN_VALVE", MAIN_VALVE},
     {"NITROGEN_VALVE", NITROGEN_VALVE}};
 
@@ -293,16 +293,17 @@ inline void fillMessagesMap(QMap<QString, MessageFormElement *> &formElements)
     formElements["SET_COOLING_TIME_TC"] = element;
 
     element = new MessageFormElement();
-    element->addInteger("n2o_filling_btn", "N2O Filling:", 0, 1);
-    element->addInteger("n2o_release_btn", "N2O Release:", 0, 1);
-    element->addInteger("n2o_detach_btn", "N2O Detatch:", 0, 1);
-    element->addInteger("n2o_venting_btn", "N2O Venting:", 0, 1);
+    element->addInteger("ox_filling_btn", "OX Filling:", 0, 1);
+    element->addInteger("ox_release_btn", "OX Release:", 0, 1);
+    element->addInteger("ox_detach_btn", "OX Detatch:", 0, 1);
+    element->addInteger("ox_venting_btn", "OX Venting:", 0, 1);
     element->addInteger("n2_filling_btn", "N2 Filling:", 0, 1);
     element->addInteger("n2_release_btn", "N2 Release:", 0, 1);
     element->addInteger("n2_detach_btn", "N2 Detach:", 0, 1);
     element->addInteger("n2_quenching_btn", "N2 Quenching:", 0, 1);
     element->addInteger("n2_3way_btn", "N2 3-Way Valve:", 0, 1);
-    element->addInteger("tars_btn", "TARS:", 0, 1);
+    element->addInteger("tars3_btn", "TARS3:", 0, 1);
+    element->addInteger("tars3m_btn", "TARS3M:", 0, 1);
     element->addInteger("nitrogen_btn", "Nitrogen:", 0, 1);
     element->addInteger("ignition_btn", "Ignition:", 0, 1);
     element->addInteger("arm_switch", "Arm:", 0, 1);
diff --git a/src/shared/Modules/Mavlink/MavlinkCodec.cpp b/src/shared/Modules/Mavlink/MavlinkCodec.cpp
index 529cc5c75edace6b014de6bbebf52ab8de8e9590..33945bcfe929f233c6d6aa9cb7548fa7de8f83a8 100644
--- a/src/shared/Modules/Mavlink/MavlinkCodec.cpp
+++ b/src/shared/Modules/Mavlink/MavlinkCodec.cpp
@@ -418,16 +418,17 @@ bool MavlinkCodec::encodeMessage(const Message& msg, SysId sysId, CompId compId,
     {
         mavlink_msg_conrig_state_tc_pack(
             sysId, compId, &output,
-            msg.getField("n2o_filing_btn").getUnsignedInteger(),
-            msg.getField("n2o_release_btn").getUnsignedInteger(),
-            msg.getField("n2o_detach_btn").getUnsignedInteger(),
-            msg.getField("n2o_venting_btn").getUnsignedInteger(),
+            msg.getField("ox_filing_btn").getUnsignedInteger(),
+            msg.getField("ox_release_btn").getUnsignedInteger(),
+            msg.getField("ox_detach_btn").getUnsignedInteger(),
+            msg.getField("ox_venting_btn").getUnsignedInteger(),
             msg.getField("n2_filling_btn").getUnsignedInteger(),
             msg.getField("n2_release_btn").getUnsignedInteger(),
             msg.getField("n2_detach_btn").getUnsignedInteger(),
             msg.getField("n2_quenching_btn").getUnsignedInteger(),
             msg.getField("n2_3way_btn").getUnsignedInteger(),
-            msg.getField("tars_btn").getUnsignedInteger(),
+            msg.getField("tars3_btn").getUnsignedInteger(),
+            msg.getField("tars3m_btn").getUnsignedInteger(),
             msg.getField("nitrogen_btn").getUnsignedInteger(),
             msg.getField("ignition_btn").getUnsignedInteger(),
             msg.getField("arm_switch").getUnsignedInteger());