diff --git a/libraries/AP_RangeFinder/RangeFinder.cpp b/libraries/AP_RangeFinder/AP_RangeFinder.cpp
similarity index 100%
rename from libraries/AP_RangeFinder/RangeFinder.cpp
rename to libraries/AP_RangeFinder/AP_RangeFinder.cpp
diff --git a/libraries/AP_RangeFinder/RangeFinder.h b/libraries/AP_RangeFinder/AP_RangeFinder.h
similarity index 100%
rename from libraries/AP_RangeFinder/RangeFinder.h
rename to libraries/AP_RangeFinder/AP_RangeFinder.h
diff --git a/libraries/AP_RangeFinder/RangeFinder_Backend.cpp b/libraries/AP_RangeFinder/AP_RangeFinder_Backend.cpp
similarity index 100%
rename from libraries/AP_RangeFinder/RangeFinder_Backend.cpp
rename to libraries/AP_RangeFinder/AP_RangeFinder_Backend.cpp
diff --git a/libraries/AP_RangeFinder/RangeFinder_Backend.h b/libraries/AP_RangeFinder/AP_RangeFinder_Backend.h
similarity index 100%
rename from libraries/AP_RangeFinder/RangeFinder_Backend.h
rename to libraries/AP_RangeFinder/AP_RangeFinder_Backend.h
diff --git a/libraries/AP_RangeFinder/RangeFinder_Backend_Serial.cpp b/libraries/AP_RangeFinder/AP_RangeFinder_Backend_Serial.cpp
similarity index 100%
rename from libraries/AP_RangeFinder/RangeFinder_Backend_Serial.cpp
rename to libraries/AP_RangeFinder/AP_RangeFinder_Backend_Serial.cpp
diff --git a/libraries/AP_RangeFinder/RangeFinder_Backend_Serial.h b/libraries/AP_RangeFinder/AP_RangeFinder_Backend_Serial.h
similarity index 100%
rename from libraries/AP_RangeFinder/RangeFinder_Backend_Serial.h
rename to libraries/AP_RangeFinder/AP_RangeFinder_Backend_Serial.h