diff --git a/Rover/GCS_MAVLink_Rover.cpp b/Rover/GCS_MAVLink_Rover.cpp
index 48a28fa6b2d3e..b4401185ba1dc 100644
--- a/Rover/GCS_MAVLink_Rover.cpp
+++ b/Rover/GCS_MAVLink_Rover.cpp
@@ -1,6 +1,6 @@
 #include "Rover.h"
 
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Rover.h"
 
 #include <AP_RPM/AP_RPM_config.h>
 #include <AP_RangeFinder/AP_RangeFinder_Backend.h>
diff --git a/Rover/GCS_Rover.h b/Rover/GCS_Rover.h
index cbd6a9f79ae96..510e9db6d0556 100644
--- a/Rover/GCS_Rover.h
+++ b/Rover/GCS_Rover.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <GCS_MAVLink/GCS.h>
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Rover.h"
 
 class GCS_Rover : public GCS
 {
diff --git a/Rover/Parameters.cpp b/Rover/Parameters.cpp
index e60b1fc5d4651..87e401805706b 100644
--- a/Rover/Parameters.cpp
+++ b/Rover/Parameters.cpp
@@ -234,42 +234,42 @@ const AP_Param::Info Rover::var_info[] = {
     GOBJECT(rcmap,                 "RCMAP_",         RCMapper),
 
     // @Group: SR0_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[0], gcs0,        "SR0_",     GCS_MAVLINK_Parameters),
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 2
     // @Group: SR1_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[1],  gcs1,       "SR1_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 3
     // @Group: SR2_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[2],  gcs2,       "SR2_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 4
     // @Group: SR3_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[3],  gcs3,       "SR3_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 5
     // @Group: SR4_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[4],  gcs4,       "SR4_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 6
     // @Group: SR5_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[5],  gcs5,       "SR5_",     GCS_MAVLINK_Parameters),
 #endif
 
 #if MAVLINK_COMM_NUM_BUFFERS >= 7
     // @Group: SR6_
-    // @Path: GCS_Mavlink.cpp
+    // @Path: GCS_MAVLink_Rover.cpp
     GOBJECTN(_gcs.chan_parameters[6],  gcs6,       "SR6_",     GCS_MAVLINK_Parameters),
 #endif
 
diff --git a/Rover/Parameters.h b/Rover/Parameters.h
index ff8d29c38b369..fc5f368af5108 100644
--- a/Rover/Parameters.h
+++ b/Rover/Parameters.h
@@ -2,7 +2,7 @@
 
 #include <AP_Common/AP_Common.h>
 
-#include "RC_Channel.h"
+#include "RC_Channel_Rover.h"
 #include <AC_Avoidance/AC_Avoid.h>
 #include "AC_Sprayer/AC_Sprayer.h"
 #include <AP_AIS/AP_AIS.h>
diff --git a/Rover/RC_Channel_Rover.cpp b/Rover/RC_Channel_Rover.cpp
index 3bb7db03858d6..21ea3be429bf6 100644
--- a/Rover/RC_Channel_Rover.cpp
+++ b/Rover/RC_Channel_Rover.cpp
@@ -1,6 +1,6 @@
 #include "Rover.h"
 
-#include "RC_Channel.h"
+#include "RC_Channel_Rover.h"
 
 // defining these two macros and including the RC_Channels_VarInfo
 // header defines the parameter information common to all vehicle
diff --git a/Rover/Rover.h b/Rover/Rover.h
index 93c7c5c64cab4..ab22bca685c73 100644
--- a/Rover/Rover.h
+++ b/Rover/Rover.h
@@ -64,13 +64,13 @@
 #include "afs_rover.h"
 #endif
 #include "Parameters.h"
-#include "GCS_Mavlink.h"
+#include "GCS_MAVLink_Rover.h"
 #include "GCS_Rover.h"
 #include "AP_Rally.h"
 #if AC_PRECLAND_ENABLED
 #include <AC_PrecLand/AC_PrecLand.h>
 #endif
-#include "RC_Channel.h"                  // RC Channel Library
+#include "RC_Channel_Rover.h"                  // RC Channel Library
 
 #include "mode.h"