diff --git a/message_definitions/pyxis.xml b/message_definitions/pyxis.xml
index 4efcf0baf5e48592feaad312b2613d5b7f3c8d13..a2b0c9507599f0203f240a6eb6a93480dbd11e27 100644
--- a/message_definitions/pyxis.xml
+++ b/message_definitions/pyxis.xml
@@ -430,7 +430,7 @@
             <field name="ada_state" type="uint8_t">ADA Controller State</field>
             <field name="fmm_state" type="uint8_t">Flight Mode Manager State</field>
             <field name="dpl_state" type="uint8_t">Deployment Controller State</field>
-            <field name="ab_state" type="uint8_t">Airbrake FSM state</field>
+            <field name="abk_state" type="uint8_t">Airbrake FSM state</field>
             <field name="nas_state" type="uint8_t">Navigation System FSM State</field>
             <field name="pressure_ada" type="float" units="Pa">Atmospheric pressure estimated by ADA</field>
             <field name="pressure_digi" type="float" units="Pa">Pressure from digital sensor</field>
@@ -453,12 +453,6 @@
             <field name="gps_lat" type="float" units="deg">Latitude</field>
             <field name="gps_lon" type="float" units="deg">Longitude</field>
             <field name="gps_alt" type="float" units="m">GPS Altitude</field>
-            <field name="vbat" type="float" units="V">Battery voltage</field>
-            <field name="vsupply_5v" type="float" units="V">Power supply 5V</field>
-            <field name="temperature" type="float" units="degC">Temperature</field>
-            <field name="pin_launch" type="uint8_t">Launch pin status (1 = connected, 0 = disconnected)</field>
-            <field name="pin_nosecone" type="uint8_t">Nosecone pin status (1 = connected, 0 = disconnected)</field>
-            <field name="servo_sensor" type="uint8_t">Servo sensor status (1 = actuated, 0 = idle)</field>
             <field name="ab_angle" type="float" units="deg">Airbrakes angle</field>
             <field name="ab_estimated_cd" type="float">Estimated drag coefficient</field>
             <field name="nas_n" type="float" units="deg">Navigation system estimated noth position</field>
@@ -473,6 +467,11 @@
             <field name="nas_bias_x" type="float">Navigation system gyroscope bias on x axis</field>
             <field name="nas_bias_y" type="float">Navigation system gyroscope bias on x axis</field>
             <field name="nas_bias_z" type="float">Navigation system gyroscope bias on x axis</field>
+            <field name="pin_launch" type="uint8_t">Launch pin status (1 = connected, 0 = disconnected)</field>
+            <field name="pin_nosecone" type="uint8_t">Nosecone pin status (1 = connected, 0 = disconnected)</field>
+            <field name="servo_sensor" type="uint8_t">Servo sensor status (1 = actuated, 0 = idle)</field>
+            <field name="vbat" type="float" units="V">Battery voltage</field>
+            <field name="temperature" type="float" units="degC">Temperature</field>
             <field name="logger_error" type="int8_t" units="">Logger error (0 = no error, -1 otherwise)</field>
         </message>
         <message id="211" name="PAYLOAD_FLIGHT_TM">
@@ -503,10 +502,6 @@
             <field name="gps_lat" type="float" units="deg">Latitude</field>
             <field name="gps_lon" type="float" units="deg">Longitude</field>
             <field name="gps_alt" type="float" units="m">GPS Altitude</field>
-            <field name="vbat" type="float" units="V">Battery voltage</field>
-            <field name="vsupply_5v" type="float" units="V">Power supply 5V</field> <!-- MAYBE USEFUL -->
-            <field name="temperature" type="float" units="degC">Temperature</field>
-            <field name="pin_nosecone" type="uint8_t">Nosecone pin status (1 = connected, 0 = disconnected)</field>
             <field name="nas_n" type="float" units="deg">Navigation system estimated noth position</field>
             <field name="nas_e" type="float" units="deg">Navigation system estimated east position</field>
             <field name="nas_d" type="float" units="m">Navigation system estimated down position</field>
@@ -520,7 +515,11 @@
             <field name="nas_bias_y" type="float">Navigation system gyroscope bias on x axis</field>
             <field name="nas_bias_z" type="float">Navigation system gyroscope bias on x axis</field>
             <!-- TODO: ADD CONTROL ALGORITHM THINGS -->
-            <field name="logger_error" type="int8_t" units="">Logger error (0 = no error, -1 otherwise)</field>
+            <field name="pin_nosecone" type="uint8_t">Nosecone pin status (1 = connected, 0 = disconnected)</field>
+            <field name="vbat" type="float" units="V">Battery voltage</field>
+            <field name="vsupply_5v" type="float" units="V">Power supply 5V</field> <!-- MAYBE USEFUL -->
+            <field name="temperature" type="float" units="degC">Temperature</field>
+            <field name="logger_error" type="int8_t" units="">Logger error (0 = no error)</field>
         </message>
         <message id="212" name="ROCKET_STATS_TM">
             <description>Low Rate Telemetry</description>