diff --git a/conf/firmwares/subsystems/fixedwing/autopilot.makefile b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
index b92c358131..c38f216004 100644
--- a/conf/firmwares/subsystems/fixedwing/autopilot.makefile
+++ b/conf/firmwares/subsystems/fixedwing/autopilot.makefile
@@ -169,7 +169,7 @@ ifeq ($(BOARD), umarim)
 ifeq ($(BOARD_VERSION), 1.0)
 ap_srcs 	+= boards/umarim/baro_board.c
 ap_CFLAGS += -DUSE_I2C1 -DUSE_ADS1114_1
-ap_CFLAGS += -DADS1114_I2C_DEVICE=i2c1
+ap_CFLAGS += -DADS1114_I2C_DEV=i2c1
 ap_srcs 	+= peripherals/ads1114.c
 endif
 else ifeq ($(BOARD), lisa_l)
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile b/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
index 2ab3beb54b..e2cc60d604 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin2_i2c.makefile
@@ -10,10 +10,10 @@ IMU_ASPIRIN2_SRCS    = $(SRC_SUBSYSTEMS)/imu.c             \
 IMU_ASPIRIN2_CFLAGS += -DUSE_I2C
 ifeq ($(ARCH), stm32)
 	IMU_ASPIRIN2_CFLAGS += -DUSE_I2C2
-	IMU_ASPIRIN2_CFLAGS += -DPPZUAVIMU_I2C_DEVICE=i2c2
+	IMU_ASPIRIN2_CFLAGS += -DPPZUAVIMU_I2C_DEV=i2c2
 else ifeq ($(ARCH), lpc21)
 	IMU_ASPIRIN2_CFLAGS += -DUSE_I2C0
-	IMU_ASPIRIN2_CFLAGS += -DPPZUAVIMU_I2C_DEVICE=i2c0
+	IMU_ASPIRIN2_CFLAGS += -DPPZUAVIMU_I2C_DEV=i2c0
 endif
 
 ap.CFLAGS += $(IMU_ASPIRIN2_CFLAGS)
diff --git a/conf/firmwares/subsystems/shared/imu_aspirin_common.makefile b/conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
index 00f3058c01..74ca8b9a28 100644
--- a/conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
+++ b/conf/firmwares/subsystems/shared/imu_aspirin_common.makefile
@@ -46,11 +46,11 @@ $(error Aspirin driver on lpc is unfinished.)
 IMU_ASPIRIN_CFLAGS += -DUSE_SPI_SLAVE0
 IMU_ASPIRIN_CFLAGS += -DUSE_SPI1
 IMU_ASPIRIN_CFLAGS += -DSSP_VIC_SLOT=9
-IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_I2C_DEVICE=i2c1
+IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_I2C_DEV=i2c1
 IMU_ASPIRIN_CFLAGS += -DUSE_I2C1
 IMU_ASPIRIN_CFLAGS += -DHMC58XX_I2C_DEVICE=i2c1 -DI2C1_VIC_SLOT=12
 else ifeq ($(ARCH), stm32)
-IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_I2C_DEVICE=i2c2
+IMU_ASPIRIN_CFLAGS += -DIMU_ASPIRIN_I2C_DEV=i2c2
 IMU_ASPIRIN_CFLAGS += -DUSE_I2C2
 IMU_ASPIRIN_CFLAGS += -DUSE_SPI2
 # Slave select configuration
diff --git a/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile b/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
index 0c4a0b5e29..bb274e0676 100644
--- a/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
+++ b/conf/firmwares/subsystems/shared/imu_b2_v1.2.makefile
@@ -44,7 +44,7 @@ imu_CFLAGS += -DIMU_B2_VERSION_1_2
 
 ifeq ($(ARCH), lpc21)
 imu_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC58XX
-imu_CFLAGS += -DHMC58XX_I2C_DEVICE=i2c1 -DUSE_I2C1 -DI2C1_VIC_SLOT=12
+imu_CFLAGS += -DHMC58XX_I2C_DEV=i2c1 -DUSE_I2C1 -DI2C1_VIC_SLOT=12
 imu_srcs += peripherals/hmc58xx.c
 else ifeq ($(ARCH), stm32)
 imu_CFLAGS += -DIMU_B2_MAG_TYPE=IMU_B2_MAG_HMC5843
diff --git a/conf/firmwares/subsystems/shared/imu_navgo.makefile b/conf/firmwares/subsystems/shared/imu_navgo.makefile
index 0088fdd01e..e7c5b8a3b8 100644
--- a/conf/firmwares/subsystems/shared/imu_navgo.makefile
+++ b/conf/firmwares/subsystems/shared/imu_navgo.makefile
@@ -5,19 +5,19 @@ IMU_NAVGO_CFLAGS += -DIMU_TYPE_H=\"boards/navgo/imu_navgo.h\"
 IMU_NAVGO_SRCS    = $(SRC_SUBSYSTEMS)/imu.c             \
                     $(SRC_BOARD)/imu_navgo.c
 
-IMU_NAVGO_I2C_DEVICE=i2c1
+IMU_NAVGO_I2C_DEV=i2c1
 IMU_NAVGO_CFLAGS += -DUSE_I2C
 IMU_NAVGO_CFLAGS += -DUSE_I2C1 -DI2C1_SCLL=25 -DI2C1_SCLH=25
 
-IMU_NAVGO_CFLAGS += -DIMU_NAVGO_I2C_DEVICE=$(IMU_NAVGO_I2C_DEVICE)
+IMU_NAVGO_CFLAGS += -DIMU_NAVGO_I2C_DEV=$(IMU_NAVGO_I2C_DEV)
 IMU_NAVGO_SRCS += peripherals/itg3200.c
 
-IMU_NAVGO_CFLAGS += -DADXL345_I2C_DEVICE=$(IMU_NAVGO_I2C_DEVICE)
+IMU_NAVGO_CFLAGS += -DADXL345_I2C_DEV=$(IMU_NAVGO_I2C_DEV)
 IMU_NAVGO_CFLAGS += -DADXL345_I2C_ADDR=ADXL345_ADDR_ALT
 IMU_NAVGO_CFLAGS += -DADXL345_BW_RATE=0x8
 IMU_NAVGO_SRCS += peripherals/adxl345.i2c.c
 
-IMU_NAVGO_CFLAGS += -DHMC58XX_I2C_DEVICE=$(IMU_NAVGO_I2C_DEVICE)
+IMU_NAVGO_CFLAGS += -DHMC58XX_I2C_DEV=$(IMU_NAVGO_I2C_DEV)
 IMU_NAVGO_SRCS += peripherals/hmc58xx.c
 
 ap.CFLAGS += $(IMU_NAVGO_CFLAGS)
diff --git a/conf/firmwares/subsystems/shared/imu_ppzuav.makefile b/conf/firmwares/subsystems/shared/imu_ppzuav.makefile
index df27ec15c6..e72e5b2b92 100644
--- a/conf/firmwares/subsystems/shared/imu_ppzuav.makefile
+++ b/conf/firmwares/subsystems/shared/imu_ppzuav.makefile
@@ -10,10 +10,10 @@ IMU_PPZUAV_SRCS += modules/sensors/imu_ppzuav.c
 IMU_PPZUAV_CFLAGS += -DUSE_I2C
 ifeq ($(ARCH), stm32)
 	IMU_PPZUAV_CFLAGS += -DUSE_I2C2
-	IMU_PPZUAV_CFLAGS += -DPPZUAVIMU_I2C_DEVICE=i2c2
+	IMU_PPZUAV_CFLAGS += -DPPZUAVIMU_I2C_DEV=i2c2
 else ifeq ($(ARCH), lpc21)
 	IMU_PPZUAV_CFLAGS += -DUSE_I2C0
-	IMU_PPZUAV_CFLAGS += -DPPZUAVIMU_I2C_DEVICE=i2c0
+	IMU_PPZUAV_CFLAGS += -DPPZUAVIMU_I2C_DEV=i2c0
 endif
 
 ap.CFLAGS += $(IMU_PPZUAV_CFLAGS)
diff --git a/conf/firmwares/subsystems/shared/imu_umarim.makefile b/conf/firmwares/subsystems/shared/imu_umarim.makefile
index b64df570cd..98456d9e18 100644
--- a/conf/firmwares/subsystems/shared/imu_umarim.makefile
+++ b/conf/firmwares/subsystems/shared/imu_umarim.makefile
@@ -5,17 +5,17 @@ IMU_UMARIM_CFLAGS += -DIMU_TYPE_H=\"boards/umarim/imu_umarim.h\"
 IMU_UMARIM_SRCS    = $(SRC_SUBSYSTEMS)/imu.c             \
                      $(SRC_BOARD)/imu_umarim.c
 
-IMU_UMARIM_I2C_DEVICE=i2c1
+IMU_UMARIM_I2C_DEV=i2c1
 IMU_UMARIM_CFLAGS += -DUSE_I2C
 IMU_UMARIM_CFLAGS += -DUSE_I2C1 -DI2C1_SCLL=25 -DI2C1_SCLH=25
 
-IMU_UMARIM_CFLAGS += -DITG3200_I2C_DEVICE=$(IMU_UMARIM_I2C_DEVICE)
+IMU_UMARIM_CFLAGS += -DITG3200_I2C_DEV=$(IMU_UMARIM_I2C_DEV)
 IMU_UMARIM_CFLAGS += -DITG3200_I2C_ADDR=ITG3200_ADDR_ALT
 IMU_UMARIM_CFLAGS += -DITG3200_SMPLRT_DIV=19
 IMU_UMARIM_CFLAGS += -DITG3200_DLPF_CFG=4
 IMU_UMARIM_SRCS += peripherals/itg3200.c
 
-IMU_UMARIM_CFLAGS += -DADXL345_I2C_DEVICE=$(IMU_UMARIM_I2C_DEVICE)
+IMU_UMARIM_CFLAGS += -DADXL345_I2C_DEV=$(IMU_UMARIM_I2C_DEV)
 IMU_UMARIM_CFLAGS += -DADXL345_I2C_ADDR=ADXL345_ADDR_ALT
 IMU_UMARIM_CFLAGS += -DADXL345_BW_RATE=0x09
 IMU_UMARIM_SRCS += peripherals/adxl345.i2c.c
diff --git a/conf/modules/digital_cam_i2c.xml b/conf/modules/digital_cam_i2c.xml
index 07d0a1042c..7bd8a44898 100644
--- a/conf/modules/digital_cam_i2c.xml
+++ b/conf/modules/digital_cam_i2c.xml
@@ -23,7 +23,7 @@
   <makefile target="ap">
     <file name="atmega_i2c_cam_ctrl.c"/>
     <file name="dc.c"/>
-      <define name="ATMEGA_I2C_DEVICE" value="i2c0"/>
+      <define name="ATMEGA_I2C_DEV" value="i2c0"/>
       <define name="USE_I2C0" value="1"/>
       <define name="SENSOR_SYNC_SEND" value="1" />
   </makefile>
diff --git a/conf/modules/imu_aspirin_i2c.xml b/conf/modules/imu_aspirin_i2c.xml
index 9da2c24e9f..26ac2e9ae2 100644
--- a/conf/modules/imu_aspirin_i2c.xml
+++ b/conf/modules/imu_aspirin_i2c.xml
@@ -20,7 +20,7 @@
 
   <makefile>
     <file name="imu_ppzuav.c"/>
-    <define name="PPZUAVIMU_I2C_DEVICE" value="i2c0" />
+    <define name="PPZUAVIMU_I2C_DEV" value="i2c0" />
     <define name="USE_I2C" />
     <define name="USE_I2C0" />
     <define name="ASPIRIN_IMU" />
diff --git a/conf/modules/imu_ppzuav.xml b/conf/modules/imu_ppzuav.xml
index 269a122bff..401f43719a 100644
--- a/conf/modules/imu_ppzuav.xml
+++ b/conf/modules/imu_ppzuav.xml
@@ -20,7 +20,7 @@
 
   <makefile target="ap">
     <file name="imu_ppzuav.c"/>
-    <define name="PPZUAVIMU_I2C_DEVICE" value="i2c0" />
+    <define name="PPZUAVIMU_I2C_DEV" value="i2c0" />
     <define name="USE_I2C" />
     <define name="USE_I2C0" />
   </makefile>
diff --git a/conf/modules/mag_hmc5843.xml b/conf/modules/mag_hmc5843.xml
index bdbf137aa6..9d7ac1b160 100644
--- a/conf/modules/mag_hmc5843.xml
+++ b/conf/modules/mag_hmc5843.xml
@@ -15,7 +15,7 @@
     <define name="USE_I2C" />
     <file name="mag_hmc5843.c"/>
     <file name="../../peripherals/hmc5843.c"/>
-    <define name="HMC5843_I2C_DEVICE" value="i2c0" />
+    <define name="HMC5843_I2C_DEV" value="i2c0" />
     <define name="USE_I2C0" />
     <define name="HMC5843_NO_IRQ" />
   </makefile>
diff --git a/sw/airborne/boards/navgo/imu_navgo.c b/sw/airborne/boards/navgo/imu_navgo.c
index a672c5f566..de89df6f4f 100644
--- a/sw/airborne/boards/navgo/imu_navgo.c
+++ b/sw/airborne/boards/navgo/imu_navgo.c
@@ -38,7 +38,7 @@
 // Peripherials
 
 // Configure ADXL345
-// ADXL345_I2C_DEVICE IMU_UMARIM_I2C_DEVICE
+// ADXL345_I2C_DEV IMU_UMARIM_I2C_DEV
 // ADXL345_I2C_ADDR ADXL345_ADDR_ALT
 #include "peripherals/adxl345.extra_i2c.h"
 
@@ -52,7 +52,7 @@ void imu_impl_init(void)
 {
   /////////////////////////////////////////////////////////////////////
   // ITG3200
-  itg3200_init(&imu_navgo.itg, &(IMU_NAVGO_I2C_DEVICE), ITG3200_ADDR_ALT);
+  itg3200_init(&imu_navgo.itg, &(IMU_NAVGO_I2C_DEV), ITG3200_ADDR_ALT);
   // change the default configuration
   imu_navgo.itg.config.smplrt_div = 1;  // 500Hz sample rate since internal is 1kHz
   imu_navgo.itg.config.dlpf_cfg = ITG3200_DLPF_10HZ;
diff --git a/sw/airborne/boards/umarim/imu_umarim.c b/sw/airborne/boards/umarim/imu_umarim.c
index 0ff9f8bc30..efc2ba29bb 100644
--- a/sw/airborne/boards/umarim/imu_umarim.c
+++ b/sw/airborne/boards/umarim/imu_umarim.c
@@ -38,14 +38,14 @@
 // Peripherials
 
 // Configure ITG3200
-// ITG3200_I2C_DEVICE IMU_UMARIM_I2C_DEVICE
+// ITG3200_I2C_DEV IMU_UMARIM_I2C_DEV
 // ITG3200_I2C_ADDR ITG3200_ADDR_ALT
 // ITG3200_SMPLRT_DIV 19
 // ITG3200_DLPF_CFG 4
 #include "peripherals/itg3200.extra.h"
 
 // Configure ADXL345
-// ADXL345_I2C_DEVICE IMU_UMARIM_I2C_DEVICE
+// ADXL345_I2C_DEV IMU_UMARIM_I2C_DEV
 // ADXL345_I2C_ADDR ADXL345_ADDR_ALT
 // ADXL345_BW_RATE 0x09 (50Hz rate, 25Hz BW)
 #include "peripherals/adxl345.extra_i2c.h"
diff --git a/sw/airborne/modules/sensors/imu_aspirin2.c b/sw/airborne/modules/sensors/imu_aspirin2.c
index 6168b68b89..23c50815a1 100644
--- a/sw/airborne/modules/sensors/imu_aspirin2.c
+++ b/sw/airborne/modules/sensors/imu_aspirin2.c
@@ -77,7 +77,7 @@ void imu_impl_init(void)
   // -switch to gyroX clock
   aspirin2_mpu60x0.buf[0] = MPU60X0_REG_PWR_MGMT_1;
   aspirin2_mpu60x0.buf[1] = 0x01;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&aspirin2_mpu60x0);
     while(aspirin2_mpu60x0.status == I2CTransPending);
 
   // MPU60X0_REG_PWR_MGMT_2: Nothing should be in standby: default OK
@@ -97,28 +97,28 @@ void imu_impl_init(void)
 #endif
   aspirin2_mpu60x0.buf[0] = MPU60X0_REG_CONFIG;
   aspirin2_mpu60x0.buf[1] = (2 << 3) | (3 << 0);
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&aspirin2_mpu60x0);
     while(aspirin2_mpu60x0.status == I2CTransPending);
 
   // MPU60X0_REG_SMPLRT_DIV
   // -100Hz output = 1kHz / (9 + 1)
   aspirin2_mpu60x0.buf[0] = MPU60X0_REG_SMPLRT_DIV;
   aspirin2_mpu60x0.buf[1] = 9;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&aspirin2_mpu60x0);
     while(aspirin2_mpu60x0.status == I2CTransPending);
 
   // MPU60X0_REG_GYRO_CONFIG
   // -2000deg/sec
   aspirin2_mpu60x0.buf[0] = MPU60X0_REG_GYRO_CONFIG;
   aspirin2_mpu60x0.buf[1] = (3<<3);
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&aspirin2_mpu60x0);
     while(aspirin2_mpu60x0.status == I2CTransPending);
 
   // MPU60X0_REG_ACCEL_CONFIG
   // 16g, no HPFL
   aspirin2_mpu60x0.buf[0] = MPU60X0_REG_ACCEL_CONFIG;
   aspirin2_mpu60x0.buf[1] = (3<<3);
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&aspirin2_mpu60x0);
     while(aspirin2_mpu60x0.status == I2CTransPending);
 
 
@@ -129,7 +129,7 @@ void imu_impl_init(void)
   // no interrupts for now, but set data ready interrupt to enable reading status bits
   aspirin2_mpu60x0.buf[0] = ITG3200_REG_INT_CFG;
   aspirin2_mpu60x0.buf[1] = 0x01;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&aspirin2_mpu60x0);
     while(aspirin2_mpu60x0.status == I2CTransPending);
 */
 
@@ -141,21 +141,21 @@ void imu_impl_init(void)
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_CFGA;  // set to rate to max speed: 50Hz no bias
   ppzuavimu_hmc5843.buf[1] = 0x00 | (0x06 << 2);
   ppzuavimu_hmc5843.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_hmc5843);
     while(ppzuavimu_hmc5843.status == I2CTransPending);
 
   ppzuavimu_hmc5843.type = I2CTransTx;
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_CFGB;  // set to gain to 1 Gauss
   ppzuavimu_hmc5843.buf[1] = 0x01<<5;
   ppzuavimu_hmc5843.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_hmc5843);
     while(ppzuavimu_hmc5843.status == I2CTransPending);
 
   ppzuavimu_hmc5843.type = I2CTransTx;
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_MODE;  // set to continuous mode
   ppzuavimu_hmc5843.buf[1] = 0x00;
   ppzuavimu_hmc5843.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_hmc5843);
     while(ppzuavimu_hmc5843.status == I2CTransPending);
 */
 }
@@ -167,7 +167,7 @@ void imu_periodic( void )
   aspirin2_mpu60x0.len_r = 21;
   aspirin2_mpu60x0.len_w = 1;
   aspirin2_mpu60x0.buf[0] = MPU60X0_REG_INT_STATUS;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE, &aspirin2_mpu60x0);
+  i2c_submit(&PPZUAVIMU_I2C_DEV, &aspirin2_mpu60x0);
 
 /*
   // Start reading the latest accelerometer data
@@ -175,7 +175,7 @@ void imu_periodic( void )
   ppzuavimu_adxl345.len_r = 6;
   ppzuavimu_adxl345.len_w = 1;
   ppzuavimu_adxl345.buf[0] = ADXL345_REG_DATA_X0;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE, &ppzuavimu_adxl345);
+  i2c_submit(&PPZUAVIMU_I2C_DEV, &ppzuavimu_adxl345);
 */
   // Start reading the latest magnetometer data
 #if PERIODIC_FREQUENCY > 60
@@ -185,7 +185,7 @@ void imu_periodic( void )
   ppzuavimu_hmc5843.len_r = 6;
   ppzuavimu_hmc5843.len_w = 1;
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_DATXM;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE, &ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV, &ppzuavimu_hmc5843);
 */
 #if PERIODIC_FREQUENCY > 60
   });
diff --git a/sw/airborne/modules/sensors/imu_ppzuav.c b/sw/airborne/modules/sensors/imu_ppzuav.c
index 216bc0d11c..900ebc1f43 100644
--- a/sw/airborne/modules/sensors/imu_ppzuav.c
+++ b/sw/airborne/modules/sensors/imu_ppzuav.c
@@ -84,7 +84,7 @@ void imu_impl_init(void)
 #  endif
 #endif
   ppzuavimu_itg3200.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_itg3200);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_itg3200);
     while(ppzuavimu_itg3200.status == I2CTransPending);
 
   /* set sample rate to 66Hz: so at 60Hz there is always a new sample ready and you loose little */
@@ -94,19 +94,19 @@ void imu_impl_init(void)
 #else
   ppzuavimu_itg3200.buf[1] = 9;  // 100Hz
 #endif
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_itg3200);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_itg3200);
     while(ppzuavimu_itg3200.status == I2CTransPending);
 
   /* switch to gyroX clock */
   ppzuavimu_itg3200.buf[0] = ITG3200_REG_PWR_MGM;
   ppzuavimu_itg3200.buf[1] = 0x01;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_itg3200);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_itg3200);
     while(ppzuavimu_itg3200.status == I2CTransPending);
 
   /* no interrupts for now, but set data ready interrupt to enable reading status bits */
   ppzuavimu_itg3200.buf[0] = ITG3200_REG_INT_CFG;
   ppzuavimu_itg3200.buf[1] = 0x01;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_itg3200);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_itg3200);
     while(ppzuavimu_itg3200.status == I2CTransPending);
 
   /////////////////////////////////////////////////////////////////////
@@ -122,7 +122,7 @@ void imu_impl_init(void)
   ppzuavimu_adxl345.buf[1] = ADXL345_RATE_100;  // normal power and 100Hz sampling, 50Hz BW
 #endif
   ppzuavimu_adxl345.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_adxl345);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_adxl345);
     while(ppzuavimu_adxl345.status == I2CTransPending);
 
   /* switch to measurement mode */
@@ -130,14 +130,14 @@ void imu_impl_init(void)
   ppzuavimu_adxl345.buf[0] = ADXL345_REG_POWER_CTL;
   ppzuavimu_adxl345.buf[1] = 1<<3;
   ppzuavimu_adxl345.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_adxl345);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_adxl345);
     while(ppzuavimu_adxl345.status == I2CTransPending);
 
   /* Set range to 16g but keeping full resolution of 3.9 mV/g */
   ppzuavimu_adxl345.type = I2CTransTx;
   ppzuavimu_adxl345.buf[0] = ADXL345_REG_DATA_FORMAT;
   ppzuavimu_adxl345.buf[1] = ADXL345_FULL_RES | ADXL345_RANGE_16G;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_adxl345);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_adxl345);
     while(ppzuavimu_adxl345.status == I2CTransPending);
 
   /////////////////////////////////////////////////////////////////////
@@ -147,21 +147,21 @@ void imu_impl_init(void)
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_CFGA;  // set to rate to max speed: 50Hz no bias
   ppzuavimu_hmc5843.buf[1] = 0x00 | (0x06 << 2);
   ppzuavimu_hmc5843.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_hmc5843);
     while(ppzuavimu_hmc5843.status == I2CTransPending);
 
   ppzuavimu_hmc5843.type = I2CTransTx;
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_CFGB;  // set to gain to 1 Gauss
   ppzuavimu_hmc5843.buf[1] = 0x01<<5;
   ppzuavimu_hmc5843.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_hmc5843);
     while(ppzuavimu_hmc5843.status == I2CTransPending);
 
   ppzuavimu_hmc5843.type = I2CTransTx;
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_MODE;  // set to continuous mode
   ppzuavimu_hmc5843.buf[1] = 0x00;
   ppzuavimu_hmc5843.len_w = 2;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE,&ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV,&ppzuavimu_hmc5843);
     while(ppzuavimu_hmc5843.status == I2CTransPending);
 
 }
@@ -173,14 +173,14 @@ void imu_periodic( void )
   ppzuavimu_itg3200.len_r = 9;
   ppzuavimu_itg3200.len_w = 1;
   ppzuavimu_itg3200.buf[0] = ITG3200_REG_INT_STATUS;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE, &ppzuavimu_itg3200);
+  i2c_submit(&PPZUAVIMU_I2C_DEV, &ppzuavimu_itg3200);
 
   // Start reading the latest accelerometer data
   ppzuavimu_adxl345.type = I2CTransTxRx;
   ppzuavimu_adxl345.len_r = 6;
   ppzuavimu_adxl345.len_w = 1;
   ppzuavimu_adxl345.buf[0] = ADXL345_REG_DATA_X0;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE, &ppzuavimu_adxl345);
+  i2c_submit(&PPZUAVIMU_I2C_DEV, &ppzuavimu_adxl345);
 
   // Start reading the latest magnetometer data
 #if PERIODIC_FREQUENCY > 60
@@ -190,7 +190,7 @@ void imu_periodic( void )
   ppzuavimu_hmc5843.len_r = 6;
   ppzuavimu_hmc5843.len_w = 1;
   ppzuavimu_hmc5843.buf[0] = HMC5843_REG_DATXM;
-  i2c_submit(&PPZUAVIMU_I2C_DEVICE, &ppzuavimu_hmc5843);
+  i2c_submit(&PPZUAVIMU_I2C_DEV, &ppzuavimu_hmc5843);
 #if PERIODIC_FREQUENCY > 60
   });
 #endif
diff --git a/sw/airborne/modules/sensors/pressure_board_navarro.c b/sw/airborne/modules/sensors/pressure_board_navarro.c
index 1d5441c09b..26fad8ee48 100644
--- a/sw/airborne/modules/sensors/pressure_board_navarro.c
+++ b/sw/airborne/modules/sensors/pressure_board_navarro.c
@@ -30,8 +30,8 @@
 
 /* Default I2C device on tiny is i2c0
  */
-#ifndef PBN_I2C_DEVICE
-#define PBN_I2C_DEVICE i2c0
+#ifndef PBN_I2C_DEV
+#define PBN_I2C_DEV i2c0
 #endif
 
 /* Sensor I2C slave address */
@@ -96,7 +96,7 @@ void pbn_periodic( void ) {
 
   // Initiate next read
   pbn_trans.buf[0] = 0;
-  I2CTransceive(PBN_I2C_DEVICE, pbn_trans, PBN_I2C_ADDR, 1, 4);
+  I2CTransceive(PBN_I2C_DEV, pbn_trans, PBN_I2C_ADDR, 1, 4);
 
 }
 
diff --git a/sw/airborne/peripherals/ads1114.c b/sw/airborne/peripherals/ads1114.c
index 3e6950ea71..cb66392ced 100644
--- a/sw/airborne/peripherals/ads1114.c
+++ b/sw/airborne/peripherals/ads1114.c
@@ -41,7 +41,7 @@ void ads1114_init( void ) {
   ads1114_1.trans.buf[0] = ADS1114_POINTER_CONFIG_REG;
   ads1114_1.trans.buf[1] = ADS1114_1_CONFIG_MSB;
   ads1114_1.trans.buf[2] = ADS1114_1_CONFIG_LSB;
-  I2CTransmit(ADS1114_I2C_DEVICE, ads1114_1.trans, ADS1114_1_I2C_ADDR, 3);
+  I2CTransmit(ADS1114_I2C_DEV, ads1114_1.trans, ADS1114_1_I2C_ADDR, 3);
   ads1114_1.config_done = FALSE;
   ads1114_1.data_available = FALSE;
 #endif
@@ -52,7 +52,7 @@ void ads1114_init( void ) {
   ads1114_2.trans.buf[0] = ADS1114_POINTER_CONFIG_REG;
   ads1114_2.trans.buf[1] = ADS1114_2_CONFIG_MSB;
   ads1114_2.trans.buf[2] = ADS1114_2_CONFIG_LSB;
-  I2CTransmit(ADS1114_I2C_DEVICE, ads1114_2.trans, ADS1114_2_I2C_ADDR, 3);
+  I2CTransmit(ADS1114_I2C_DEV, ads1114_2.trans, ADS1114_2_I2C_ADDR, 3);
   ads1114_2.config_done = FALSE;
   ads1114_2.data_available = FALSE;
 #endif
@@ -64,7 +64,7 @@ void ads1114_read( struct ads1114_periph * p ) {
   // start new reading when previous is done (and read if success)
   if (p->config_done && p->trans.status == I2CTransDone) {
     p->trans.buf[0] = ADS1114_POINTER_CONV_REG;
-    I2CTransceive(ADS1114_I2C_DEVICE, p->trans, p->i2c_addr, 1, 2);
+    I2CTransceive(ADS1114_I2C_DEV, p->trans, p->i2c_addr, 1, 2);
   }
 }
 
diff --git a/sw/airborne/peripherals/ads1114.h b/sw/airborne/peripherals/ads1114.h
index 550cd7dfb4..faa15ffc1e 100644
--- a/sw/airborne/peripherals/ads1114.h
+++ b/sw/airborne/peripherals/ads1114.h
@@ -109,8 +109,8 @@
 
 /* Default I2C device */
 // FIXME all ads on the same device for now
-#ifndef ADS1114_I2C_DEVICE
-#define ADS1114_I2C_DEVICE i2c1
+#ifndef ADS1114_I2C_DEV
+#define ADS1114_I2C_DEV i2c1
 #endif
 
 struct ads1114_periph {
diff --git a/sw/airborne/peripherals/adxl345.extra_i2c.h b/sw/airborne/peripherals/adxl345.extra_i2c.h
index aa9a4a9506..a8c75cc2b3 100644
--- a/sw/airborne/peripherals/adxl345.extra_i2c.h
+++ b/sw/airborne/peripherals/adxl345.extra_i2c.h
@@ -63,8 +63,8 @@
 #endif
 
 /* Default I2C device */
-#ifndef ADXL345_I2C_DEVICE
-#define ADXL345_I2C_DEVICE i2c1
+#ifndef ADXL345_I2C_DEV
+#define ADXL345_I2C_DEV i2c1
 #endif
 
 // Config done flag
diff --git a/sw/airborne/peripherals/adxl345.i2c.c b/sw/airborne/peripherals/adxl345.i2c.c
index 85d968ea9a..9c1da88610 100644
--- a/sw/airborne/peripherals/adxl345.i2c.c
+++ b/sw/airborne/peripherals/adxl345.i2c.c
@@ -61,25 +61,25 @@ static void adxl345_send_config(void)
     case ADXL_CONF_RATE:
       adxl345_i2c_trans.buf[0] = ADXL345_REG_BW_RATE;
       adxl345_i2c_trans.buf[1] = ADXL345_BW_RATE;
-      I2CTransmit(ADXL345_I2C_DEVICE, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
+      I2CTransmit(ADXL345_I2C_DEV, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
       adxl345_init_status++;
       break;
     case ADXL_CONF_POWER:
       adxl345_i2c_trans.buf[0] = ADXL345_REG_POWER_CTL;
       adxl345_i2c_trans.buf[1] = ADXL345_POWER_CTL;
-      I2CTransmit(ADXL345_I2C_DEVICE, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
+      I2CTransmit(ADXL345_I2C_DEV, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
       adxl345_init_status++;
       break;
     case ADXL_CONF_INT:
       adxl345_i2c_trans.buf[0] = ADXL345_REG_INT_ENABLE;
       adxl345_i2c_trans.buf[1] = ADXL345_INT_ENABLE;
-      I2CTransmit(ADXL345_I2C_DEVICE, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
+      I2CTransmit(ADXL345_I2C_DEV, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
       adxl345_init_status++;
       break;
     case ADXL_CONF_FORMAT:
       adxl345_i2c_trans.buf[0] = ADXL345_REG_DATA_FORMAT;
       adxl345_i2c_trans.buf[1] = ADXL345_DATA_FORMAT;
-      I2CTransmit(ADXL345_I2C_DEVICE, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
+      I2CTransmit(ADXL345_I2C_DEV, adxl345_i2c_trans, ADXL345_I2C_ADDR, 2);
       adxl345_init_status++;
       break;
     case ADXL_CONF_DONE:
@@ -107,7 +107,7 @@ void adxl345_read(void)
 {
   if (adxl345_initialized && adxl345_i2c_trans.status == I2CTransDone) {
     adxl345_i2c_trans.buf[0] = ADXL345_REG_DATA_X0;
-    I2CTransceive(ADXL345_I2C_DEVICE, adxl345_i2c_trans, ADXL345_I2C_ADDR, 1, 6);
+    I2CTransceive(ADXL345_I2C_DEV, adxl345_i2c_trans, ADXL345_I2C_ADDR, 1, 6);
   }
 }
 
diff --git a/sw/airborne/peripherals/hmc5843.c b/sw/airborne/peripherals/hmc5843.c
index 4eac86d75a..9b7ece8aad 100644
--- a/sw/airborne/peripherals/hmc5843.c
+++ b/sw/airborne/peripherals/hmc5843.c
@@ -9,8 +9,8 @@
 struct Hmc5843 hmc5843;
 void exti9_5_irq_handler(void);
 
-#ifndef HMC5843_I2C_DEVICE
-#define HMC5843_I2C_DEVICE i2c2
+#ifndef HMC5843_I2C_DEV
+#define HMC5843_I2C_DEV i2c2
 #endif
 
 void hmc5843_init(void)
@@ -30,21 +30,21 @@ static void send_config(void)
   hmc5843.i2c_trans.buf[0] = HMC5843_REG_CFGA;  // set to rate to 50Hz
   hmc5843.i2c_trans.buf[1] = 0x00 | (0x06 << 2);
   hmc5843.i2c_trans.len_w = 2;
-  i2c_submit(&HMC5843_I2C_DEVICE,&hmc5843.i2c_trans);
+  i2c_submit(&HMC5843_I2C_DEV,&hmc5843.i2c_trans);
   while(hmc5843.i2c_trans.status == I2CTransPending);
 
   hmc5843.i2c_trans.type = I2CTransTx;
   hmc5843.i2c_trans.buf[0] = HMC5843_REG_CFGB;  // set to gain to 1 Gauss
   hmc5843.i2c_trans.buf[1] = 0x01<<5;
   hmc5843.i2c_trans.len_w = 2;
-  i2c_submit(&HMC5843_I2C_DEVICE,&hmc5843.i2c_trans);
+  i2c_submit(&HMC5843_I2C_DEV,&hmc5843.i2c_trans);
   while(hmc5843.i2c_trans.status == I2CTransPending);
 
   hmc5843.i2c_trans.type = I2CTransTx;
   hmc5843.i2c_trans.buf[0] = HMC5843_REG_MODE;  // set to continuous mode
   hmc5843.i2c_trans.buf[1] = 0x00;
   hmc5843.i2c_trans.len_w = 2;
-  i2c_submit(&HMC5843_I2C_DEVICE,&hmc5843.i2c_trans);
+  i2c_submit(&HMC5843_I2C_DEV,&hmc5843.i2c_trans);
   while(hmc5843.i2c_trans.status == I2CTransPending);
 
 }
@@ -67,11 +67,11 @@ void hmc5843_idle_task(void)
   if (hmc5843.i2c_trans.status == I2CTransRunning || hmc5843.i2c_trans.status == I2CTransPending) return;
 
   if (hmc5843.initialized && mag_eoc() && !hmc5843.sent_tx && !hmc5843.sent_rx) {
-    if (HMC5843_I2C_DEVICE.status == I2CIdle && i2c_idle(&HMC5843_I2C_DEVICE)) {
+    if (HMC5843_I2C_DEV.status == I2CIdle && i2c_idle(&HMC5843_I2C_DEV)) {
       hmc5843.i2c_trans.type = I2CTransTx;
       hmc5843.i2c_trans.len_w = 1;
       hmc5843.i2c_trans.buf[0] = 0x3;
-      i2c_submit(&HMC5843_I2C_DEVICE, &hmc5843.i2c_trans);
+      i2c_submit(&HMC5843_I2C_DEV, &hmc5843.i2c_trans);
       hmc5843.sent_tx = 1;
       return;
     }
@@ -82,7 +82,7 @@ void hmc5843_idle_task(void)
     hmc5843.i2c_trans.len_r = 6;
     hmc5843.i2c_trans.len_w = 1;
     hmc5843.i2c_trans.buf[0] = 0x3;
-    i2c_submit(&HMC5843_I2C_DEVICE, &hmc5843.i2c_trans);
+    i2c_submit(&HMC5843_I2C_DEV, &hmc5843.i2c_trans);
     hmc5843.sent_rx = 1;
     hmc5843.sent_tx = 0;
     return;
@@ -105,19 +105,19 @@ void hmc5843_periodic(void)
   if (!hmc5843.initialized) {
     send_config();
     hmc5843.initialized = TRUE;
-  } else if (hmc5843.timeout++ > HMC5843_TIMEOUT && HMC5843_I2C_DEVICE.status == I2CIdle && i2c_idle(&HMC5843_I2C_DEVICE)){
+  } else if (hmc5843.timeout++ > HMC5843_TIMEOUT && HMC5843_I2C_DEV.status == I2CIdle && i2c_idle(&HMC5843_I2C_DEV)){
 #ifdef USE_HMC59843_ARCH_RESET
     hmc5843_arch_reset();
 #endif
     hmc5843.i2c_trans.type = I2CTransTx;
     hmc5843.i2c_trans.len_w = 1;
     hmc5843.i2c_trans.buf[0] = 0x3;
-    i2c_submit(&HMC5843_I2C_DEVICE, &hmc5843.i2c_trans);
+    i2c_submit(&HMC5843_I2C_DEV, &hmc5843.i2c_trans);
     while(hmc5843.i2c_trans.status == I2CTransPending || hmc5843.i2c_trans.status == I2CTransRunning);
 
     hmc5843.i2c_trans.type = I2CTransRx;
     hmc5843.i2c_trans.len_r = 6;
-    i2c_submit(&HMC5843_I2C_DEVICE, &hmc5843.i2c_trans);
+    i2c_submit(&HMC5843_I2C_DEV, &hmc5843.i2c_trans);
     while(hmc5843.i2c_trans.status == I2CTransPending || hmc5843.i2c_trans.status == I2CTransRunning);
     hmc5843.timeout = 0;
   }
diff --git a/sw/airborne/peripherals/hmc58xx.c b/sw/airborne/peripherals/hmc58xx.c
index c563ef75ba..cf982aa412 100644
--- a/sw/airborne/peripherals/hmc58xx.c
+++ b/sw/airborne/peripherals/hmc58xx.c
@@ -47,8 +47,8 @@
 #endif
 
 /* Default I2C device is i2c2 (for lisa) */
-#ifndef HMC58XX_I2C_DEVICE
-#define HMC58XX_I2C_DEVICE i2c2
+#ifndef HMC58XX_I2C_DEV
+#define HMC58XX_I2C_DEV i2c2
 #endif
 
 
@@ -58,7 +58,7 @@ void hmc58xx_init(struct Hmc58xx *hmc, bool_t set_default_config)
   hmc->i2c_trans.slave_addr = HMC58XX_ADDR;
   if (set_default_config) {
     hmc->type = HMC_TYPE_5883;
-    hmc->i2c_p = &(HMC58XX_I2C_DEVICE);
+    hmc->i2c_p = &(HMC58XX_I2C_DEV);
     hmc->config.dor = HMC58XX_DO;
     hmc->config.ms = HMC58XX_MS;
     hmc->config.gn = HMC58XX_GN;
diff --git a/sw/airborne/subsystems/imu/imu_aspirin.c b/sw/airborne/subsystems/imu/imu_aspirin.c
index b995579bd7..b3031b4709 100644
--- a/sw/airborne/subsystems/imu/imu_aspirin.c
+++ b/sw/airborne/subsystems/imu/imu_aspirin.c
@@ -93,7 +93,7 @@ void imu_impl_init(void) {
   aspirin_adxl345.output_buf = &imu_aspirin.accel_tx_buf[0];
 
   /* Gyro configuration and initalization */
-  itg3200_init(&imu_aspirin.gyro_itg, &(IMU_ASPIRIN_I2C_DEVICE), ITG3200_ADDR);
+  itg3200_init(&imu_aspirin.gyro_itg, &(IMU_ASPIRIN_I2C_DEV), ITG3200_ADDR);
   /* change the default config */
   imu_aspirin.gyro_itg.config.smplrt_div = ASPIRIN_GYRO_SMPLRT_DIV; // Sample rate divider defaults to 533Hz
   imu_aspirin.gyro_itg.config.dlpf_cfg = ASPIRIN_GYRO_DLPF_CFG; // defaults to 8kHz internal with 256Hz low pass