diff --git a/message_definitions/v1.0/common.xml b/message_definitions/v1.0/common.xml
index 8b96e8355a1..9998cdb7bc5 100644
--- a/message_definitions/v1.0/common.xml
+++ b/message_definitions/v1.0/common.xml
@@ -4139,26 +4139,26 @@
     </enum>
     <enum name="AIS_NAV_STATUS">
       <description>Navigational status of AIS vessel, enum duplicated from AIS standard, https://gpsd.gitlab.io/gpsd/AIVDM.html</description>
-      <entry value="0" name="UNDER_WAY">
+      <entry value="0" name="AIS_NAV_STATUS_UNDER_WAY">
         <description>Under way using engine.</description>
       </entry>
-      <entry value="1" name="AIS_NAV_ANCHORED"/>
-      <entry value="2" name="AIS_NAV_UN_COMMANDED"/>
-      <entry value="3" name="AIS_NAV_RESTRICTED_MANOEUVERABILITY"/>
-      <entry value="4" name="AIS_NAV_DRAUGHT_CONSTRAINED"/>
-      <entry value="5" name="AIS_NAV_MOORED"/>
-      <entry value="6" name="AIS_NAV_AGROUND"/>
-      <entry value="7" name="AIS_NAV_FISHING"/>
-      <entry value="8" name="AIS_NAV_SAILING"/>
-      <entry value="9" name="AIS_NAV_RESERVED_HSC"/>
-      <entry value="10" name="AIS_NAV_RESERVED_WIG"/>
-      <entry value="11" name="AIS_NAV_RESERVED_1"/>
-      <entry value="12" name="AIS_NAV_RESERVED_2"/>
-      <entry value="13" name="AIS_NAV_RESERVED_3"/>
-      <entry value="14" name="AIS_NAV_AIS_SART">
+      <entry value="1" name="AIS_NAV_STATUS_ANCHORED"/>
+      <entry value="2" name="AIS_NAV_STATUS_UN_COMMANDED"/>
+      <entry value="3" name="AIS_NAV_STATUS_RESTRICTED_MANOEUVERABILITY"/>
+      <entry value="4" name="AIS_NAV_STATUS_DRAUGHT_CONSTRAINED"/>
+      <entry value="5" name="AIS_NAV_STATUS_MOORED"/>
+      <entry value="6" name="AIS_NAV_STATUS_AGROUND"/>
+      <entry value="7" name="AIS_NAV_STATUS_FISHING"/>
+      <entry value="8" name="AIS_NAV_STATUS_SAILING"/>
+      <entry value="9" name="AIS_NAV_STATUS_RESERVED_HSC"/>
+      <entry value="10" name="AIS_NAV_STATUS_RESERVED_WIG"/>
+      <entry value="11" name="AIS_NAV_STATUS_RESERVED_1"/>
+      <entry value="12" name="AIS_NAV_STATUS_RESERVED_2"/>
+      <entry value="13" name="AIS_NAV_STATUS_RESERVED_3"/>
+      <entry value="14" name="AIS_NAV_STATUS_AIS_SART">
         <description>Search And Rescue Transponder.</description>
       </entry>
-      <entry value="15" name="AIS_NAV_UNKNOWN">
+      <entry value="15" name="AIS_NAV_STATUS_UNKNOWN">
         <description>Not available (default).</description>
       </entry>
     </enum>
@@ -6309,7 +6309,7 @@
       <field type="uint16_t" name="COG" units="cdeg">Course over ground</field>
       <field type="uint16_t" name="heading" units="cdeg">True heading</field>
       <field type="uint16_t" name="velocity" units="cm/s">Speed over ground</field>
-      <field type="int8_t" name="turn_rate" units="cdeg/s">Turn rate</field>
+      <field type="int8_t" name="turn_rate" units="ddeg/s">Turn rate, 0.1 degrees per second</field>
       <field type="uint8_t" name="navigational_status" enum="AIS_NAV_STATUS">Navigational status</field>
       <field type="uint8_t" name="type" enum="AIS_TYPE">Type of vessels</field>
       <field type="uint16_t" name="dimension_bow" units="m">Distance from lat/lon location to bow</field>