diff --git a/dev/source/docs/ArduCopter_MAVLink_Messages.rst b/dev/source/docs/ArduCopter_MAVLink_Messages.rst
index 4a3f9c9a88..f180e8c70d 100644
--- a/dev/source/docs/ArduCopter_MAVLink_Messages.rst
+++ b/dev/source/docs/ArduCopter_MAVLink_Messages.rst
@@ -9,12 +9,12 @@ The `MAVLink <https://mavlink.io/en/>`_ protocol supports a variety of features
 
 This page is auto-generated from analysing the ArduCopter source code, and provides an indication of which messages (and commands) are handled by, requestable from, and sent from the firmware. A message being handled does not guarantee full support, but at least shows that the autopilot is aware it exists, and will try to do something meaningful with it.
 
-Known :ref:`unsupported messages <mavlink_missing_messages>` (and commands) are shown at the end.
+Known :ref:`unsupported messages <ArduCopter_mavlink_missing_messages>` (and commands) are shown at the end.
 
-The autopilot includes a set of :ref:`mavlink_stream_groups` for convenience, which allow configuring the stream rates of groups of requestable messages by setting parameter values. It is also possible to manually request messages, and request individual messages be streamed at a specified rate. 
+The autopilot includes a set of :ref:`ArduCopter_mavlink_stream_groups` for convenience, which allow configuring the stream rates of groups of requestable messages by setting parameter values. It is also possible to manually request messages, and request individual messages be streamed at a specified rate. 
 
 
-.. _mavlink_incoming_messages:
+.. _ArduCopter_mavlink_incoming_messages:
 
 Incoming Messages
 =================
@@ -127,7 +127,7 @@ Messages the autopilot handles when received.
   `VISION_POSITION_ESTIMATE <https://mavlink.io/en/messages/common.html#VISION_POSITION_ESTIMATE>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, common
   `VISION_SPEED_ESTIMATE <https://mavlink.io/en/messages/common.html#VISION_SPEED_ESTIMATE>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, common
 
-.. _mavlink_incoming_commands:
+.. _ArduCopter_mavlink_incoming_commands:
 
 Incoming Commands
 =================
@@ -257,7 +257,7 @@ Commands the autopilot handles when received.
   `MAV_CMD_VIDEO_START_CAPTURE <https://mavlink.io/en/messages/common.html#MAV_CMD_VIDEO_START_CAPTURE>`_, `AP_Camera/AP_Camera.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Camera/AP_Camera.cpp>`_, common
   `MAV_CMD_VIDEO_STOP_CAPTURE <https://mavlink.io/en/messages/common.html#MAV_CMD_VIDEO_STOP_CAPTURE>`_, `AP_Camera/AP_Camera.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Camera/AP_Camera.cpp>`_, common
 
-.. _mavlink_requestable_messages:
+.. _ArduCopter_mavlink_requestable_messages:
 
 Requestable Messages
 ====================
@@ -351,7 +351,7 @@ Messages that can be requested/streamed from the autopilot.
   `WINCH_STATUS <https://mavlink.io/en/messages/common.html#WINCH_STATUS>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, common
   `WIND <https://mavlink.io/en/messages/ardupilotmega.html#WIND>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, ardupilotmega
 
-.. _mavlink_outgoing_messages:
+.. _ArduCopter_mavlink_outgoing_messages:
 
 Outgoing Messages
 =================
@@ -458,7 +458,7 @@ Messages the autopilot will send automatically (unrequested).
   `WINCH_STATUS <https://mavlink.io/en/messages/common.html#WINCH_STATUS>`_, `AP_Winch/AP_Winch_Daiwa.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Winch/AP_Winch_Daiwa.cpp>`_, common
   `WIND <https://mavlink.io/en/messages/ardupilotmega.html#WIND>`_, `ArduCopter/GCS_Mavlink.cpp <https://github.com/ArduPilot/ardupilot/tree/master/ArduCopter/GCS_Mavlink.cpp>`_, ardupilotmega
 
-.. _mavlink_named_floats:
+.. _ArduCopter_mavlink_named_floats:
 
 Named Floats
 ============
@@ -471,7 +471,7 @@ Breakout of named floating-point (numerical) values sent by the autopilot.
 
   `NAMED_VALUE_FLOAT:HEST <https://mavlink.io/en/messages/common.html#NAMED_VALUE_FLOAT>`_, `ArduCopter/mode_flowhold.cpp <https://github.com/ArduPilot/ardupilot/tree/master/ArduCopter/mode_flowhold.cpp>`_, common
 
-.. _mavlink_named_ints:
+.. _ArduCopter_mavlink_named_ints:
 
 Named Ints
 ==========
@@ -486,7 +486,7 @@ Breakout of named integer values sent by the autopilot.
   `NAMED_VALUE_INT:VIDEOTOG <https://mavlink.io/en/messages/common.html#NAMED_VALUE_INT>`_, `ArduCopter/toy_mode.cpp <https://github.com/ArduPilot/ardupilot/tree/master/ArduCopter/toy_mode.cpp>`_, common
   `NAMED_VALUE_INT:WIFIRESET <https://mavlink.io/en/messages/common.html#NAMED_VALUE_INT>`_, `ArduCopter/toy_mode.cpp <https://github.com/ArduPilot/ardupilot/tree/master/ArduCopter/toy_mode.cpp>`_, common
 
-.. _mavlink_stream_groups:
+.. _ArduCopter_mavlink_stream_groups:
 
 Stream Groups
 =============
@@ -550,7 +550,7 @@ Message groups with stream rates requestable by ``SRn_*`` parameters. Messages i
   `ADSB_VEHICLE <https://mavlink.io/en/messages/common.html#ADSB_VEHICLE>`_, SRn_ADSB, common
   `AIS_VESSEL <https://mavlink.io/en/messages/common.html#AIS_VESSEL>`_, SRn_ADSB, common
 
-.. _mavlink_missing_messages:
+.. _ArduCopter_mavlink_missing_messages:
 
 Missing Messages
 ================
@@ -679,7 +679,7 @@ Unsupported / unhandled messages.
   `WIFI_CONFIG_AP <https://mavlink.io/en/messages/common.html#WIFI_CONFIG_AP>`_, UNSUPPORTED, common
   `WIND_COV <https://mavlink.io/en/messages/common.html#WIND_COV>`_, UNSUPPORTED, common
 
-.. _mavlink_missing_commands:
+.. _ArduCopter_mavlink_missing_commands:
 
 Missing Commands
 ================
diff --git a/dev/source/docs/Rover_MAVLink_Messages.rst b/dev/source/docs/Rover_MAVLink_Messages.rst
index c91aaeb107..3ae75a309a 100644
--- a/dev/source/docs/Rover_MAVLink_Messages.rst
+++ b/dev/source/docs/Rover_MAVLink_Messages.rst
@@ -9,12 +9,12 @@ The `MAVLink <https://mavlink.io/en/>`_ protocol supports a variety of features
 
 This page is auto-generated from analysing the Rover source code, and provides an indication of which messages (and commands) are handled by, requestable from, and sent from the firmware. A message being handled does not guarantee full support, but at least shows that the autopilot is aware it exists, and will try to do something meaningful with it.
 
-Known :ref:`unsupported messages <mavlink_missing_messages>` (and commands) are shown at the end.
+Known :ref:`unsupported messages <Rover_mavlink_missing_messages>` (and commands) are shown at the end.
 
-The autopilot includes a set of :ref:`mavlink_stream_groups` for convenience, which allow configuring the stream rates of groups of requestable messages by setting parameter values. It is also possible to manually request messages, and request individual messages be streamed at a specified rate. 
+The autopilot includes a set of :ref:`Rover_mavlink_stream_groups` for convenience, which allow configuring the stream rates of groups of requestable messages by setting parameter values. It is also possible to manually request messages, and request individual messages be streamed at a specified rate. 
 
 
-.. _mavlink_incoming_messages:
+.. _Rover_mavlink_incoming_messages:
 
 Incoming Messages
 =================
@@ -124,7 +124,7 @@ Messages the autopilot handles when received.
   `VISION_POSITION_ESTIMATE <https://mavlink.io/en/messages/common.html#VISION_POSITION_ESTIMATE>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, common
   `VISION_SPEED_ESTIMATE <https://mavlink.io/en/messages/common.html#VISION_SPEED_ESTIMATE>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, common
 
-.. _mavlink_incoming_commands:
+.. _Rover_mavlink_incoming_commands:
 
 Incoming Commands
 =================
@@ -250,7 +250,7 @@ Commands the autopilot handles when received.
   `MAV_CMD_VIDEO_START_CAPTURE <https://mavlink.io/en/messages/common.html#MAV_CMD_VIDEO_START_CAPTURE>`_, `AP_Camera/AP_Camera.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Camera/AP_Camera.cpp>`_, common
   `MAV_CMD_VIDEO_STOP_CAPTURE <https://mavlink.io/en/messages/common.html#MAV_CMD_VIDEO_STOP_CAPTURE>`_, `AP_Camera/AP_Camera.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Camera/AP_Camera.cpp>`_, common
 
-.. _mavlink_requestable_messages:
+.. _Rover_mavlink_requestable_messages:
 
 Requestable Messages
 ====================
@@ -344,7 +344,7 @@ Messages that can be requested/streamed from the autopilot.
   `WINCH_STATUS <https://mavlink.io/en/messages/common.html#WINCH_STATUS>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, common
   `WIND <https://mavlink.io/en/messages/ardupilotmega.html#WIND>`_, `GCS_MAVLink/GCS_Common.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/GCS_MAVLink/GCS_Common.cpp>`_, ardupilotmega
 
-.. _mavlink_outgoing_messages:
+.. _Rover_mavlink_outgoing_messages:
 
 Outgoing Messages
 =================
@@ -449,7 +449,7 @@ Messages the autopilot will send automatically (unrequested).
   `WINCH_STATUS <https://mavlink.io/en/messages/common.html#WINCH_STATUS>`_, `AP_Winch/AP_Winch_Daiwa.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_Winch/AP_Winch_Daiwa.cpp>`_, common
   `WIND <https://mavlink.io/en/messages/ardupilotmega.html#WIND>`_, `AP_WindVane/AP_WindVane.cpp <https://github.com/ArduPilot/ardupilot/tree/master/libraries/AP_WindVane/AP_WindVane.cpp>`_, ardupilotmega
 
-.. _mavlink_stream_groups:
+.. _Rover_mavlink_stream_groups:
 
 Stream Groups
 =============
@@ -511,7 +511,7 @@ Message groups with stream rates requestable by ``SRn_*`` parameters. Messages i
   `ADSB_VEHICLE <https://mavlink.io/en/messages/common.html#ADSB_VEHICLE>`_, SRn_ADSB, common
   `AIS_VESSEL <https://mavlink.io/en/messages/common.html#AIS_VESSEL>`_, SRn_ADSB, common
 
-.. _mavlink_missing_messages:
+.. _Rover_mavlink_missing_messages:
 
 Missing Messages
 ================
@@ -643,7 +643,7 @@ Unsupported / unhandled messages.
   `WIFI_CONFIG_AP <https://mavlink.io/en/messages/common.html#WIFI_CONFIG_AP>`_, UNSUPPORTED, common
   `WIND_COV <https://mavlink.io/en/messages/common.html#WIND_COV>`_, UNSUPPORTED, common
 
-.. _mavlink_missing_commands:
+.. _Rover_mavlink_missing_commands:
 
 Missing Commands
 ================