diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_CompanionComputer.cpp b/libraries/AP_RangeFinder/AP_RangeFinder_MAVLink.cpp
similarity index 100%
rename from libraries/AP_RangeFinder/AP_RangeFinder_CompanionComputer.cpp
rename to libraries/AP_RangeFinder/AP_RangeFinder_MAVLink.cpp
diff --git a/libraries/AP_RangeFinder/AP_RangeFinder_CompanionComputer.h b/libraries/AP_RangeFinder/AP_RangeFinder_MAVLink.h
similarity index 100%
rename from libraries/AP_RangeFinder/AP_RangeFinder_CompanionComputer.h
rename to libraries/AP_RangeFinder/AP_RangeFinder_MAVLink.h
diff --git a/libraries/AP_RangeFinder/RangeFinder.cpp b/libraries/AP_RangeFinder/RangeFinder.cpp
index dfa0223b9d..adf51506c7 100644
--- a/libraries/AP_RangeFinder/RangeFinder.cpp
+++ b/libraries/AP_RangeFinder/RangeFinder.cpp
@@ -24,7 +24,7 @@
 #include "AP_RangeFinder_LightWareI2C.h"
 #include "AP_RangeFinder_LightWareSerial.h"
 #include "AP_RangeFinder_Bebop.h"
-#include "AP_RangeFinder_CompanionComputer.h"
+#include "AP_RangeFinder_MAVLink.h"
 
 // table of user settable parameters
 const AP_Param::GroupInfo RangeFinder::var_info[] = {