diff --git a/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml b/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
index 2690673ae..0a455e46b 100644
--- a/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
+++ b/ground/openpilotgcs/src/plugins/coreplugin/OpenPilotGCS.xml
@@ -492,18 +492,18 @@
           <needle1MinValue>0</needle1MinValue>
           <needle1Move>Rotate</needle1Move>
           <needle1ObjectField>Roll</needle1ObjectField>
-          <needle2DataObject>AttitudeRaw</needle2DataObject>
+          <needle2DataObject>Accels</needle2DataObject>
           <needle2Factor>1</needle2Factor>
           <needle2MaxValue>20</needle2MaxValue>
           <needle2MinValue>-20</needle2MinValue>
           <needle2Move>Horizontal</needle2Move>
-          <needle2ObjectField>accels-X</needle2ObjectField>
-          <needle3DataObject>AttitudeRaw</needle3DataObject>
+          <needle2ObjectField>X</needle2ObjectField>
+          <needle3DataObject>Accels</needle3DataObject>
           <needle3Factor>-1</needle3Factor>
           <needle3MaxValue>360</needle3MaxValue>
           <needle3MinValue>0</needle3MinValue>
           <needle3Move>Rotate</needle3Move>
-          <needle3ObjectField>accels-X</needle3ObjectField>
+          <needle3ObjectField>X</needle3ObjectField>
           <useOpenGLFlag>false</useOpenGLFlag>
         </data>
       </Deluxe__PCT__20Turn__PCT__20Coordinator>
@@ -1005,8 +1005,8 @@
           <minValue>-11</minValue>
           <redMax>11</redMax>
           <redMin>-11</redMin>
-          <sourceDataObject>AttitudeRaw</sourceDataObject>
-          <sourceObjectField>accels-X</sourceObjectField>
+          <sourceDataObject>Accels</sourceDataObject>
+          <sourceObjectField>X</sourceObjectField>
           <useOpenGLFlag>false</useOpenGLFlag>
           <yellowMax>-5</yellowMax>
           <yellowMin>-11</yellowMin>
@@ -1028,8 +1028,8 @@
           <minValue>-11</minValue>
           <redMax>11</redMax>
           <redMin>-11</redMin>
-          <sourceDataObject>AttitudeRaw</sourceDataObject>
-          <sourceObjectField>accels-Y</sourceObjectField>
+          <sourceDataObject>Accels</sourceDataObject>
+          <sourceObjectField>Y</sourceObjectField>
           <useOpenGLFlag>false</useOpenGLFlag>
           <yellowMax>-5</yellowMax>
           <yellowMin>-11</yellowMin>
@@ -1051,8 +1051,8 @@
           <minValue>-11</minValue>
           <redMax>11</redMax>
           <redMin>-11</redMin>
-          <sourceDataObject>AttitudeRaw</sourceDataObject>
-          <sourceObjectField>accels-Z</sourceObjectField>
+          <sourceDataObject>Accels</sourceDataObject>
+          <sourceObjectField>Z</sourceObjectField>
           <useOpenGLFlag>false</useOpenGLFlag>
           <yellowMax>-5</yellowMax>
           <yellowMin>-11</yellowMin>
@@ -1734,24 +1734,24 @@
           <dataSize>60</dataSize>
           <plotCurve0>
             <color>4294901760</color>
-            <uavField>accels-X</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>X</uavField>
+            <uavObject>Accels</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve0>
           <plotCurve1>
             <color>4283782655</color>
-            <uavField>accels-Y</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Y</uavField>
+            <uavObject>Accels</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve1>
           <plotCurve2>
             <color>4283804160</color>
-            <uavField>accels-Z</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Z</uavField>
+            <uavObject>Accels</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
@@ -1966,24 +1966,24 @@
           <dataSize>60</dataSize>
           <plotCurve0>
             <color>4294901760</color>
-            <uavField>accels-X</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>X</uavField>
+            <uavObject>Accels</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve0>
           <plotCurve1>
             <color>4283782655</color>
-            <uavField>accels-Y</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Y</uavField>
+            <uavObject>Accels</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve1>
           <plotCurve2>
             <color>4283804160</color>
-            <uavField>accels-Z</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Z</uavField>
+            <uavObject>Accels</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
@@ -2006,24 +2006,24 @@
           <dataSize>60</dataSize>
           <plotCurve0>
             <color>4283804160</color>
-            <uavField>gyros-Z</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Z</uavField>
+            <uavObject>Gyros</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve0>
           <plotCurve1>
             <color>4283782655</color>
-            <uavField>gyros-Y</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Y</uavField>
+            <uavObject>Gyros</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve1>
           <plotCurve2>
             <color>4294901760</color>
-            <uavField>gyros-X</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>X</uavField>
+            <uavObject>Gyros</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
@@ -2046,24 +2046,24 @@
           <dataSize>60</dataSize>
           <plotCurve0>
             <color>4294901760</color>
-            <uavField>magnetometers-X</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>X</uavField>
+            <uavObject>Magnetometer</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve0>
           <plotCurve1>
             <color>4283782655</color>
-            <uavField>magnetometers-Y</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Y</uavField>
+            <uavObject>Magnetometer</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>
           </plotCurve1>
           <plotCurve2>
             <color>4283804160</color>
-            <uavField>magnetometers-Z</uavField>
-            <uavObject>AttitudeRaw</uavObject>
+            <uavField>Z</uavField>
+            <uavObject>Magnetometer</uavObject>
             <yMaximum>0</yMaximum>
             <yMinimum>0</yMinimum>
             <yScalePower>0</yScalePower>