diff --git a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
index d67684eb9a0bc1fac644ae1b58e8a8bb61d36048..bcbb1bf047f10dfa8ee8afc56c211ce02a404181 100644
--- a/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
+++ b/src/FirmwarePlugin/APM/MavCmdInfoCommon.json
@@ -12,7 +12,7 @@
             "category":             "Basic",
             "param1": {
                 "label":            "Pitch:",
-                "units":            "degrees",
+                "units":            "deg",
                 "default":          15,
                 "decimalPlaces":    2
             },
diff --git a/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json b/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
index 0494750b1faabf10d554ac8a734374987fa7d570..e6bc1eade40f3e0fcf40de5c1e9b2146b9e9cd45 100644
--- a/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
+++ b/src/FirmwarePlugin/APM/MavCmdInfoFixedWing.json
@@ -147,7 +147,7 @@
             "category": "Basic",
             "param1": {
                 "label": "Pitch:",
-                "units": "degrees",
+                "units": "deg",
                 "default": 10,
                 "decimalPlaces": 0
             },
diff --git a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
index acaa58088ec938aa62495c48f7c897bb9ecc2529..97ed87a8f6e92946edbc350403c4a01428a561f5 100644
--- a/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
+++ b/src/FirmwarePlugin/PX4/MavCmdInfoFixedWing.json
@@ -135,7 +135,7 @@
             "category": "Basic",
             "param1": {
                 "label": "Pitch:",
-                "units": "degrees",
+                "units": "deg",
                 "default": 10,
                 "decimalPlaces": 0
             },
diff --git a/src/MissionManager/MavCmdInfoCommon.json b/src/MissionManager/MavCmdInfoCommon.json
index 9f2651367d983c44b475e79edf876d3f1ba9f3ed..e4180eb0f52bae0af02539c6271b4df4c8f9793a 100644
--- a/src/MissionManager/MavCmdInfoCommon.json
+++ b/src/MissionManager/MavCmdInfoCommon.json
@@ -138,7 +138,7 @@
             "category":             "Basic",
             "param1": {
                 "label":            "Pitch:",
-                "units":            "degrees",
+                "units":            "deg",
                 "default":          15,
                 "decimalPlaces":    2
             },
@@ -250,7 +250,7 @@
             "param4": {
                 "label":            "Heading goal:",
                 "default":          0,
-                "units":            "degrees",
+                "units":            "deg",
                 "decimalPlaces":    2
             }
         },
@@ -280,7 +280,7 @@
             "category":             "VTOL",
             "param4": {
                 "label":            "Heading:",
-                "units":            "degrees",
+                "units":            "deg",
                 "default":          0.0,
                 "decimalPlaces":    2
             }
@@ -295,7 +295,7 @@
             "category":             "VTOL",
             "param4": {
                 "label":            "Heading:",
-                "units":            "degrees",
+                "units":            "deg",
                 "default":          0.0,
                 "decimalPlaces":    2
             },
@@ -371,7 +371,7 @@
             "category":     "Conditionals",
             "param1": {
                 "label":            "Heading:",
-                "units":            "degrees",
+                "units":            "deg",
                 "default":          0,
                 "decimalPlaces":    1
             },
diff --git a/src/Vehicle/GPSFact.json b/src/Vehicle/GPSFact.json
index 826ae1d6d6a60a7af7eec194006a58e1691918f7..a8b2cb5bf8ab245bd09caed794fcf79a064a60c1 100644
--- a/src/Vehicle/GPSFact.json
+++ b/src/Vehicle/GPSFact.json
@@ -19,7 +19,7 @@
             "shortDescription": "Course Over Ground",
             "type":             "double",
             "decimalPlaces":    1,
-            "units":            "degrees"
+            "units":            "deg"
         },
         {
             "name":             "lock",
diff --git a/src/Vehicle/VehicleFact.json b/src/Vehicle/VehicleFact.json
index ffa3ff1c007fe7260a2af1c572e1cf202ff8f640..d9053665ddd6c9a8166ad997499fde9ae0de9b44 100644
--- a/src/Vehicle/VehicleFact.json
+++ b/src/Vehicle/VehicleFact.json
@@ -7,21 +7,21 @@
             "shortDescription": "Roll",
             "type":             "double",
             "decimalPlaces":    1,
-            "units":            "degrees"
+            "units":            "deg"
         },
         {
             "name":             "pitch",
             "shortDescription": "Pitch",
             "type":             "double",
             "decimalPlaces":    1,
-            "units":            "degrees"
+            "units":            "deg"
         },
         {
             "name":             "heading",
             "shortDescription": "Heading",
             "type":             "double",
             "decimalPlaces":    0,
-            "units":            "degrees"
+            "units":            "deg"
         },
         {
             "name":             "groundSpeed",
diff --git a/src/Vehicle/WindFact.json b/src/Vehicle/WindFact.json
index 881c5ee986fa94072537c26567c30d8e501ef840..d9cec3de73b91c0e8c9bd947ab5c956cf7f336d1 100644
--- a/src/Vehicle/WindFact.json
+++ b/src/Vehicle/WindFact.json
@@ -7,7 +7,7 @@
             "shortDescription": "Wind Direction",
             "type":             "double",
             "decimalPlaces":    1,
-            "units":            "degrees"
+            "units":            "deg"
         },
         {
             "name":             "speed",