diff --git a/ArduSub/GCS_Mavlink.cpp b/ArduSub/GCS_MAVLink_Sub.cpp
similarity index 100%
rename from ArduSub/GCS_Mavlink.cpp
rename to ArduSub/GCS_MAVLink_Sub.cpp
diff --git a/ArduSub/GCS_Mavlink.h b/ArduSub/GCS_MAVLink_Sub.h
similarity index 100%
rename from ArduSub/GCS_Mavlink.h
rename to ArduSub/GCS_MAVLink_Sub.h
diff --git a/ArduSub/RC_Channel.cpp b/ArduSub/RC_Channel_Sub.cpp
similarity index 100%
rename from ArduSub/RC_Channel.cpp
rename to ArduSub/RC_Channel_Sub.cpp
diff --git a/ArduSub/RC_Channel.h b/ArduSub/RC_Channel_Sub.h
similarity index 100%
rename from ArduSub/RC_Channel.h
rename to ArduSub/RC_Channel_Sub.h