diff --git a/conf/modules/electric_ardrone2.xml b/conf/modules/bat_voltage_ardrone2.xml
similarity index 100%
rename from conf/modules/electric_ardrone2.xml
rename to conf/modules/bat_voltage_ardrone2.xml
diff --git a/sw/airborne/boards/ardrone/board.c b/sw/airborne/boards/ardrone/board.c
index 61e3408e15..0948f0bb18 100644
--- a/sw/airborne/boards/ardrone/board.c
+++ b/sw/airborne/boards/ardrone/board.c
@@ -28,6 +28,12 @@
 #include <stdlib.h>
 #include "mcu.h"
 
+/* check if the electric_ardrone2 module is loaded */
+#include "generated/modules.h"
+#ifndef BAT_VOLTAGE_ARDRONE2_PERIODIC_FREQ
+#warning No battery voltage measurement available! Please add <load name="electric_ardrone2.xml"/> to your modules.
+#endif
+
 void board_init(void)
 {
   // First we try to kill the program.elf and its respawner if it is running
diff --git a/sw/airborne/modules/sensors/electric_ardrone2.c b/sw/airborne/modules/sensors/bat_voltage_ardrone2.c
similarity index 100%
rename from sw/airborne/modules/sensors/electric_ardrone2.c
rename to sw/airborne/modules/sensors/bat_voltage_ardrone2.c
diff --git a/sw/airborne/modules/sensors/electric_ardrone2.h b/sw/airborne/modules/sensors/bat_voltage_ardrone2.h
similarity index 100%
rename from sw/airborne/modules/sensors/electric_ardrone2.h
rename to sw/airborne/modules/sensors/bat_voltage_ardrone2.h