diff --git a/Blimp/GCS_Mavlink.cpp b/Blimp/GCS_MAVLink_Blimp.cpp
similarity index 100%
rename from Blimp/GCS_Mavlink.cpp
rename to Blimp/GCS_MAVLink_Blimp.cpp
diff --git a/Blimp/GCS_Mavlink.h b/Blimp/GCS_MAVLink_Blimp.h
similarity index 100%
rename from Blimp/GCS_Mavlink.h
rename to Blimp/GCS_MAVLink_Blimp.h
diff --git a/Blimp/RC_Channel.cpp b/Blimp/RC_Channel_Blimp.cpp
similarity index 100%
rename from Blimp/RC_Channel.cpp
rename to Blimp/RC_Channel_Blimp.cpp
diff --git a/Blimp/RC_Channel.h b/Blimp/RC_Channel_Blimp.h
similarity index 100%
rename from Blimp/RC_Channel.h
rename to Blimp/RC_Channel_Blimp.h