diff --git a/conf/modules/gps_i2c.xml b/conf/modules/gps_ubx_i2c.xml
similarity index 86%
rename from conf/modules/gps_i2c.xml
rename to conf/modules/gps_ubx_i2c.xml
index 8711e3a114..ce51226f26 100644
--- a/conf/modules/gps_i2c.xml
+++ b/conf/modules/gps_ubx_i2c.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="gps_i2c" dir="gps">
+<module name="gps_ubx_i2c" dir="gps">
   <doc>
     <description>
       U-blox GPS (I2C)
@@ -9,7 +9,7 @@
   </doc>
 
   <header>
-    <file name="gps_i2c.h"/>
+    <file name="gps_ubx_i2c.h"/>
   </header>
   <init fun="gps_ubx_i2c_init()"/>
   <periodic fun="gps_ubx_i2c_periodic()" freq="10."/>
@@ -21,7 +21,7 @@
     <define name="GPS_UBX_I2C_DEV" value="$(GPS_UBX_I2C_DEV_LOWER)"/>
     <define name="GPS_I2C"/>
     <define name="I2C_BUF_LEN" value="255"/>
-    <file name="gps_i2c.c"/>
+    <file name="gps_ubx_i2c.c"/>
   </makefile>
 
 </module>
diff --git a/sw/airborne/modules/gps/gps_i2c.c b/sw/airborne/modules/gps/gps_ubx_i2c.c
similarity index 99%
rename from sw/airborne/modules/gps/gps_i2c.c
rename to sw/airborne/modules/gps/gps_ubx_i2c.c
index 7165b5e5c1..8b26a0673b 100644
--- a/sw/airborne/modules/gps/gps_i2c.c
+++ b/sw/airborne/modules/gps/gps_ubx_i2c.c
@@ -24,7 +24,7 @@
 #include "mcu_periph/i2c.h"
 #include "mcu_periph/uart.h"
 #include "mcu_periph/sys_time.h"
-#include "pprzlink/messages.h"
+#include "modules/gps/gps_ubx_i2c.h"
 #include "subsystems/datalink/downlink.h"
 #include <math.h>
 
diff --git a/sw/airborne/modules/gps/gps_i2c.h b/sw/airborne/modules/gps/gps_ubx_i2c.h
similarity index 100%
rename from sw/airborne/modules/gps/gps_i2c.h
rename to sw/airborne/modules/gps/gps_ubx_i2c.h
diff --git a/sw/airborne/subsystems/gps/gps_ubx.h b/sw/airborne/subsystems/gps/gps_ubx.h
index 63c4baf04c..2f7dabc254 100644
--- a/sw/airborne/subsystems/gps/gps_ubx.h
+++ b/sw/airborne/subsystems/gps/gps_ubx.h
@@ -34,7 +34,7 @@
 #endif
 
 #ifdef GPS_I2C
-#include "modules/gps/gps_i2c.h"
+#include "modules/gps/gps_ubx_i2c.h"
 #endif
 
 #include "mcu_periph/uart.h"