diff --git a/conf/modules/airspeed_amsys.xml b/conf/modules/airspeed_amsys.xml
index da60b5aa69..5deffea0fb 100644
--- a/conf/modules/airspeed_amsys.xml
+++ b/conf/modules/airspeed_amsys.xml
@@ -8,7 +8,7 @@
       (AMS 5812-0003-D)
       (AMS 5812-0001-D)
     </description>
-    <define name="AIRSPEED_AMSYS_I2C_DEV" value="i2c0" description="change default i2c peripheral"/>
+    <configure name="AIRSPEED_AMSYS_I2C_DEV" value="i2c0" description="change default i2c peripheral"/>
     <define name="AIRSPEED_AMSYS_MAXPRESURE" value="2068" description="max sensor pressure (Pa) (default: 2068 for AMS 5812-0003-D)(for AMS 5812-0001-D use 1034)"/>
     <define name="AIRSPEED_AMSYS_SCALE" value="1.0" description="sensor scale factor (default: 1.0)"/>
     <define name="AIRSPEED_AMSYS_FILTER" value="0." description="sensor filter (default: 0. max:1)"/>
@@ -34,6 +34,13 @@
   <event fun="AirspeedAmsysEvent()"/>
 
   <makefile>
+    <raw>
+      AIRSPEED_AMSYS_I2C_DEV ?= i2c0
+      AIRSPEED_AMSYS_I2C_DEV_LOWER=$(shell echo $(AIRSPEED_AMSYS_I2C_DEV) | tr A-Z a-z)
+      AIRSPEED_AMSYS_I2C_DEV_UPPER=$(shell echo $(AIRSPEED_AMSYS_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(AIRSPEED_AMSYS_I2C_DEV_UPPER)"/>
+    <define name="AIRSPEED_AMSYS_I2C_DEV" value="$(AIRSPEED_AMSYS_I2C_DEV_LOWER)"/>
     <file name="airspeed_amsys.c"/>
   </makefile>
 
diff --git a/conf/modules/airspeed_ets.xml b/conf/modules/airspeed_ets.xml
index aaaabb73e7..2f6dfcff9e 100644
--- a/conf/modules/airspeed_ets.xml
+++ b/conf/modules/airspeed_ets.xml
@@ -18,7 +18,7 @@
       - Yellow wire: SDA
       - Brown wire: SCL
     </description>
-    <define name="AIRSPEED_ETS_I2C_DEV" value="i2cX" description="set i2c peripheral (default: i2c0)"/>
+    <configure name="AIRSPEED_ETS_I2C_DEV" value="i2cX" description="set i2c peripheral (default: i2c0)"/>
     <define name="AIRSPEED_ETS_OFFSET" value="offset" description="sensor reading offset for sensor in proprietary mode (default: 0)"/>
     <define name="AIRSPEED_ETS_SCALE" value="scale" description="sensor scale factor for sensor in proprietary mode  (default: 1.8)"/>
     <define name="AIRSPEED_ETS_START_DELAY" value="delay" description="set initial start delay in seconds"/>
@@ -35,6 +35,13 @@
   <event fun="AirspeedEtsEvent()"/>
 
   <makefile>
+    <raw>
+      AIRSPEED_ETS_I2C_DEV ?= i2c0
+      AIRSPEED_ETS_I2C_DEV_LOWER=$(shell echo $(AIRSPEED_ETS_I2C_DEV) | tr A-Z a-z)
+      AIRSPEED_ETS_I2C_DEV_UPPER=$(shell echo $(AIRSPEED_ETS_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(AIRSPEED_ETS_I2C_DEV_UPPER)"/>
+    <define name="AIRSPEED_ETS_I2C_DEV" value="$(AIRSPEED_ETS_I2C_DEV_LOWER)"/>
     <file name="airspeed_ets.c"/>
   </makefile>
 
diff --git a/conf/modules/baro_amsys.xml b/conf/modules/baro_amsys.xml
index 6118f779d3..5517515208 100644
--- a/conf/modules/baro_amsys.xml
+++ b/conf/modules/baro_amsys.xml
@@ -6,7 +6,7 @@
       Baro AMSYS (I2C).
       Module to read a Amsys AMS 5812-0150-A barometric sensor via I2C.
     </description>
-    <define name="BARO_AMSYS_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
+    <configure name="BARO_AMSYS_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
     <define name="BARO_AMSYS_MAX_PRESSURE" value="103400" description="max sensor pressure (Pa) (default: 103400 for -0150)"/>
     <define name="BARO_AMSYS_SCALE" value="1" description="sensor scale factor (default: 1)"/>
     <define name="BARO_AMSYS_FILTER" value="0." description="sensor filter (default: 0. max:1)"/>
@@ -30,6 +30,13 @@
   <event fun="BaroAmsysEvent()"/>
 
   <makefile target="ap">
+    <raw>
+      BARO_AMSYS_I2C_DEV ?= i2c0
+      BARO_AMSYS_I2C_DEV_LOWER=$(shell echo $(BARO_AMSYS_I2C_DEV) | tr A-Z a-z)
+      BARO_AMSYS_I2C_DEV_UPPER=$(shell echo $(BARO_AMSYS_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(BARO_AMSYS_I2C_DEV_UPPER)"/>
+    <define name="BARO_AMSYS_I2C_DEV" value="$(BARO_AMSYS_I2C_DEV_LOWER)"/>
     <file name="baro_amsys.c"/>
   </makefile>
 
diff --git a/conf/modules/baro_bmp.xml b/conf/modules/baro_bmp.xml
index 1bf6bde874..0b1cdf9530 100644
--- a/conf/modules/baro_bmp.xml
+++ b/conf/modules/baro_bmp.xml
@@ -3,7 +3,7 @@
 <module name="baro_bmp" dir="sensors">
   <doc>
     <description>Bosch BMP085 pressure sensor</description>
-    <define name="BMP_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
+    <configure name="BMP_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
     <define name="SENSOR_SYNC_SEND" description="flag to transmit the data as it is acquired"/>
   </doc>
   <header>
@@ -13,6 +13,13 @@
   <periodic fun="baro_bmp_periodic()" freq="15"/>
   <event fun="baro_bmp_event()"/>
   <makefile target="ap">
+    <raw>
+      BMP_I2C_DEV ?= i2c0
+      BMP_I2C_DEV_LOWER=$(shell echo $(BMP_I2C_DEV) | tr A-Z a-z)
+      BMP_I2C_DEV_UPPER=$(shell echo $(BMP_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(BMP_I2C_DEV_UPPER)"/>
+    <define name="BMP_I2C_DEV" value="$(BMP_I2C_DEV_LOWER)"/>
     <file name="baro_bmp.c"/>
     <file name="bmp085.c" dir="peripherals"/>
   </makefile>
diff --git a/conf/modules/baro_ets.xml b/conf/modules/baro_ets.xml
index ec53f74a56..9bab9384b4 100644
--- a/conf/modules/baro_ets.xml
+++ b/conf/modules/baro_ets.xml
@@ -18,7 +18,7 @@
       - Brown wire: SCL
 
     </description>
-    <define name="BARO_ETS_I2C_DEV" value="i2cX" description="set i2c peripheral (default: i2c0)"/>
+    <configure name="BARO_ETS_I2C_DEV" value="i2cX" description="set i2c peripheral (default: i2c0)"/>
     <define name="BARO_ETS_SCALE" value="scale" description="scale factor to convert raw ADC measurement to pressure in Pascal (default: 37.5)"/>
     <define name="BARO_ETS_ALT_SCALE" value="scale" description="scale factor to convert raw ADC measurement to altitude change in meters (default: 0.32)"/>
     <define name="BARO_ETS_ALT_SCALE" value="scale" description="pressure offset in Pascal when converting raw adc to real pressure (default: 101325.0="/>
@@ -34,6 +34,13 @@
   <event fun="BaroEtsEvent()"/>
 
   <makefile target="ap">
+    <raw>
+      BARO_ETS_I2C_DEV ?= i2c0
+      BARO_ETS_I2C_DEV_LOWER=$(shell echo $(BARO_ETS_I2C_DEV) | tr A-Z a-z)
+      BARO_ETS_I2C_DEV_UPPER=$(shell echo $(BARO_ETS_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(BARO_ETS_I2C_DEV_UPPER)"/>
+    <define name="BARO_ETS_I2C_DEV" value="$(BARO_ETS_I2C_DEV_LOWER)"/>
     <file name="baro_ets.c"/>
   </makefile>
 
diff --git a/conf/modules/baro_hca.xml b/conf/modules/baro_hca.xml
index 3a368f48d8..b4c25f0b98 100644
--- a/conf/modules/baro_hca.xml
+++ b/conf/modules/baro_hca.xml
@@ -3,7 +3,7 @@
 <module name="baro_hca" dir="sensors">
   <doc>
     <description>Baro sensortechnics HCA (I2C)</description>
-    <define name="BARO_HCA_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
+    <configure name="BARO_HCA_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
   </doc>
 
   <header>
@@ -14,6 +14,13 @@
   <event fun="BaroHcaEvent()"/>
 
   <makefile target="ap">
+    <raw>
+      BARO_HCA_I2C_DEV ?= i2c0
+      BARO_HCA_I2C_DEV_LOWER=$(shell echo $(BARO_HCA_I2C_DEV) | tr A-Z a-z)
+      BARO_HCA_I2C_DEV_UPPER=$(shell echo $(BARO_HCA_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(BARO_HCA_I2C_DEV_UPPER)"/>
+    <define name="BARO_HCA_I2C_DEV" value="$(BARO_HCA_I2C_DEV_LOWER)"/>
     <file name="baro_hca.c"/>
   </makefile>
 
diff --git a/conf/modules/baro_ms5611_i2c.xml b/conf/modules/baro_ms5611_i2c.xml
index 027cd4061c..49268e25ec 100644
--- a/conf/modules/baro_ms5611_i2c.xml
+++ b/conf/modules/baro_ms5611_i2c.xml
@@ -6,7 +6,7 @@
       Baro MS5611 (I2C)
       Measurement Specialties MS5611-01BA pressure sensor (I2C)
     </description>
-    <define name="MS5611_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
+    <configure name="MS5611_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
     <define name="SENSOR_SYNC_SEND" description="flag to enable sending BARO_MS5611 message on every new measurement"/>
   </doc>
   <header>
@@ -17,6 +17,13 @@
   <periodic fun="baro_ms5611_periodic_check()" freq="40"/>
   <event fun="baro_ms5611_event()"/>
   <makefile target="ap">
+    <raw>
+      MS5611_I2C_DEV ?= i2c0
+      MS5611_I2C_DEV_LOWER=$(shell echo $(MS5611_I2C_DEV) | tr A-Z a-z)
+      MS5611_I2C_DEV_UPPER=$(shell echo $(MS5611_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(MS5611_I2C_DEV_UPPER)"/>
+    <define name="MS5611_I2C_DEV" value="$(MS5611_I2C_DEV_LOWER)"/>
     <file name="baro_ms5611_i2c.c"/>
     <file name="ms5611.c" dir="peripherals"/>
     <file name="ms5611_i2c.c" dir="peripherals"/>
diff --git a/conf/modules/baro_scp_i2c.xml b/conf/modules/baro_scp_i2c.xml
index 3b09407f7f..1b71ee439c 100644
--- a/conf/modules/baro_scp_i2c.xml
+++ b/conf/modules/baro_scp_i2c.xml
@@ -3,7 +3,7 @@
 <module name="baro_scp_i2c" dir="sensors">
   <doc>
     <description>VTI SCP1000 pressure sensor (I2C)</description>
-    <define name="SCP_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
+    <configure name="SCP_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
     <define name="SENSOR_SYNC_SEND" description="flag to transmit the data as it is acquired"/>
   </doc>
   <header>
@@ -13,6 +13,13 @@
   <periodic fun="baro_scp_periodic()" freq="1.8"/>
   <event fun="baro_scp_event()"/>
   <makefile target="ap">
+    <raw>
+      SCP_I2C_DEV ?= i2c0
+      SCP_I2C_DEV_LOWER=$(shell echo $(SCP_I2C_DEV) | tr A-Z a-z)
+      SCP_I2C_DEV_UPPER=$(shell echo $(SCP_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(SCP_I2C_DEV_UPPER)"/>
+    <define name="SCP_I2C_DEV" value="$(SCP_I2C_DEV_LOWER)"/>
     <file name="baro_scp_i2c.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/digital_cam_i2c.xml b/conf/modules/digital_cam_i2c.xml
index b076bb9ee6..975f9593cf 100644
--- a/conf/modules/digital_cam_i2c.xml
+++ b/conf/modules/digital_cam_i2c.xml
@@ -10,6 +10,7 @@
       Using the PAYLOAD_COMMAND, all functions of the camera can be controlled.
       It can trigger photos based on GPS distance, time or circle radius in both fixedwings and rotorcraft.
     </description>
+    <configure name="ATMEGA_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
     <define name="DC_SHOOT_ON_BUTTON_RELEASE" />
     <define name="DC_SHOT_SYNC_SEND" value="TRUE|FALSE" description="send DC_SHOT message when photo was taken (default: TRUE)"/>
   </doc>
@@ -26,10 +27,15 @@
   <datalink message="PAYLOAD_COMMAND" fun="ParseCameraCommand()"/>
 
   <makefile target="ap">
+    <raw>
+      ATMEGA_I2C_DEV ?= i2c0
+      ATMEGA_I2C_DEV_LOWER=$(shell echo $(ATMEGA_I2C_DEV) | tr A-Z a-z)
+      ATMEGA_I2C_DEV_UPPER=$(shell echo $(ATMEGA_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(ATMEGA_I2C_DEV_UPPER)"/>
+    <define name="ATMEGA_I2C_DEV" value="$(ATMEGA_I2C_DEV_LOWER)"/>
     <file name="atmega_i2c_cam_ctrl.c"/>
     <file name="dc.c"/>
-    <define name="ATMEGA_I2C_DEV" value="i2c0"/>
-    <define name="USE_I2C0" value="1"/>
   </makefile>
 
   <makefile target="sim">
diff --git a/conf/modules/ezcurrent.xml b/conf/modules/ezcurrent.xml
index 80bdf6021a..a748b79499 100644
--- a/conf/modules/ezcurrent.xml
+++ b/conf/modules/ezcurrent.xml
@@ -3,7 +3,7 @@
 <module name="ezcurrent" dir="sensors">
   <doc>
     <description>EzOSD Current sensor (I2C).</description>
-    <define name="EZCURRENT_I2C_DEV" value="i2c1" description="change default i2c peripheral to i2c1"/>
+    <configure name="EZCURRENT_I2C_DEV" value="i2c1" description="change default i2c peripheral to i2c1"/>
   </doc>
 
   <header>
@@ -14,6 +14,13 @@
   <event fun="ezcurrent_read_event()"/>
 
   <makefile target="ap">
+    <raw>
+      EZCURRENT_I2C_DEV ?= i2c0
+      EZCURRENT_I2C_DEV_LOWER=$(shell echo $(EZCURRENT_I2C_DEV) | tr A-Z a-z)
+      EZCURRENT_I2C_DEV_UPPER=$(shell echo $(EZCURRENT_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(EZCURRENT_I2C_DEV_UPPER)"/>
+    <define name="EZCURRENT_I2C_DEV" value="$(EZCURRENT_I2C_DEV_LOWER)"/>
     <file name="ezcurrent.c"/>
     <!-- This disables the standard electrical monitoring system -->
     <define name="DISABLE_ELECTRICAL" description="Disable default electrical handling"/>
diff --git a/conf/modules/generic_com.xml b/conf/modules/generic_com.xml
index 35b3496269..42470d8453 100644
--- a/conf/modules/generic_com.xml
+++ b/conf/modules/generic_com.xml
@@ -6,7 +6,7 @@
       Generic com.
       Can be used for Satcom/GSM
     </description>
-    <define name="GENERIC_COM_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
+    <configure name="GENERIC_COM_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
     <define name="GENERIC_COM_SLAVE_ADDR" value="i2c address"/>
   </doc>
   <header>
@@ -16,6 +16,13 @@
   <periodic fun="generic_com_periodic()" period="180" start="start_com()" stop="stop_com()" autorun="TRUE"/>
   <event fun="generic_com_event()"/>
   <makefile>
+    <raw>
+      GENERIC_COM_I2C_DEV ?= i2c0
+      GENERIC_COM_I2C_DEV_LOWER=$(shell echo $(GENERIC_COM_I2C_DEV) | tr A-Z a-z)
+      GENERIC_COM_I2C_DEV_UPPER=$(shell echo $(GENERIC_COM_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(GENERIC_COM_I2C_DEV_UPPER)"/>
+    <define name="GENERIC_COM_I2C_DEV" value="$(GENERIC_COM_I2C_DEV_LOWER)"/>
     <file name="generic_com.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/humid_htm_b71.xml b/conf/modules/humid_htm_b71.xml
index be0cfa000a..9500907ed2 100644
--- a/conf/modules/humid_htm_b71.xml
+++ b/conf/modules/humid_htm_b71.xml
@@ -3,7 +3,7 @@
 <module name="humid_htm_b71" dir="meteo">
   <doc>
     <description>TronSens HTM-B71 humidity sensor (I2C)</description>
-    <define name="HTM_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
+    <configure name="HTM_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
   </doc>
   <header>
     <file name="humid_htm_b71.h"/>
@@ -13,6 +13,13 @@
   <periodic fun="humid_htm_read()"  freq="4" delay="14"/>
   <event fun="humid_htm_event()"/>
   <makefile target="ap">
+    <raw>
+      HTM_I2C_DEV ?= i2c0
+      HTM_I2C_DEV_LOWER=$(shell echo $(HTM_I2C_DEV) | tr A-Z a-z)
+      HTM_I2C_DEV_UPPER=$(shell echo $(HTM_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(HTM_I2C_DEV_UPPER)"/>
+    <define name="HTM_I2C_DEV" value="$(HTM_I2C_DEV_LOWER)"/>
     <file name="humid_htm_b71.c"/>
   </makefile>
 </module>
diff --git a/conf/modules/imu_mpu9250.xml b/conf/modules/imu_mpu9250.xml
index c1b39854ed..5ff64c6dfb 100644
--- a/conf/modules/imu_mpu9250.xml
+++ b/conf/modules/imu_mpu9250.xml
@@ -17,12 +17,17 @@
   <periodic fun="imu_mpu9250_report()" freq="10" autorun="TRUE"/>
   <event fun="imu_mpu9250_event()"/>
   <makefile>
+    <raw>
+      IMU_MPU9250_I2C_DEV ?= i2c1
+      IMU_MPU9250_I2C_DEV_LOWER=$(shell echo $(IMU_MPU9250_I2C_DEV) | tr A-Z a-z)
+      IMU_MPU9250_I2C_DEV_UPPER=$(shell echo $(IMU_MPU9250_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(IMU_MPU9250_I2C_DEV_UPPER)"/>
+    <define name="IMU_MPU9250_I2C_DEV" value="$(IMU_MPU9250_I2C_DEV_LOWER)"/>
     <file name="imu_mpu9250.c"/>
     <file name="mpu9250.c" dir="peripherals"/>
     <file name="mpu9250_i2c.c" dir="peripherals"/>
     <file name="ak8963.c" dir="peripherals"/>
-    <define name="USE_I2C"/>
-    <define name="IMU_MPU9250_I2C_DEV" value="$(IMU_MPU9250_I2C_DEV)"/>
   </makefile>
 </module>
 
diff --git a/conf/modules/mag_hmc5843.xml b/conf/modules/mag_hmc5843.xml
index 3d922fee0c..c14e5801a2 100644
--- a/conf/modules/mag_hmc5843.xml
+++ b/conf/modules/mag_hmc5843.xml
@@ -3,6 +3,7 @@
 <module name="sensors">
   <doc>
     <description>hmc5843 magnetometer</description>
+    <configure name="HMC5843_I2C_DEV" value="i2cX" description="select which i2c peripheral to use (default i2c0)"/>
   </doc>
   <header>
     <file name="mag_hmc5843.h"/>
@@ -11,11 +12,15 @@
   <periodic fun="hmc5843_module_periodic()" freq="60"/>
   <event fun="hmc5843_module_event()"/>
   <makefile>
-    <define name="USE_I2C"/>
+    <raw>
+      HMC5843_I2C_DEV ?= i2c0
+      HMC5843_I2C_DEV_LOWER=$(shell echo $(HMC5843_I2C_DEV) | tr A-Z a-z)
+      HMC5843_I2C_DEV_UPPER=$(shell echo $(HMC5843_I2C_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(HMC5843_I2C_DEV_UPPER)"/>
+    <define name="HMC5843_I2C_DEV" value="$(HMC5843_I2C_DEV_LOWER)"/>
     <file name="mag_hmc5843.c"/>
     <file name="hmc5843.c" dir="peripherals"/>
-    <define name="HMC5843_I2C_DEV" value="i2c0"/>
-    <define name="USE_I2C0"/>
     <define name="HMC5843_NO_IRQ"/>
   </makefile>
 </module>
diff --git a/conf/modules/mag_hmc58xx.xml b/conf/modules/mag_hmc58xx.xml
index 491a4c202a..85dc38feb5 100644
--- a/conf/modules/mag_hmc58xx.xml
+++ b/conf/modules/mag_hmc58xx.xml
@@ -26,9 +26,9 @@
         $(error mag_hmc58xx module error: please configure MAG_HMC58XX_I2C_DEV)
       endif
       MAG_HMC58XX_I2C_DEV_UPPER=$(shell echo $(MAG_HMC58XX_I2C_DEV) | tr a-z A-Z)
+      MAG_HMC58XX_I2C_DEV_LOWER=$(shell echo $(MAG_HMC58XX_I2C_DEV) | tr A-Z a-z)
     </raw>
-    <define name="USE_I2C"/>
     <define name="USE_$(MAG_HMC58XX_I2C_DEV_UPPER)"/>
-    <define name="MAG_HMC58XX_I2C_DEV" value="$(MAG_HMC58XX_I2C_DEV)"/>
+    <define name="MAG_HMC58XX_I2C_DEV" value="$(MAG_HMC58XX_I2C_DEV_LOWER)"/>
   </makefile>
 </module>
diff --git a/conf/modules/temp_temod.xml b/conf/modules/temp_temod.xml
index d9dca0d7c3..f6cfe7f625 100644
--- a/conf/modules/temp_temod.xml
+++ b/conf/modules/temp_temod.xml
@@ -1,15 +1,9 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<!--
-     Hygrosens TEMOD-I2C-Rx temperature sensor
-     @define SCP_I2C_DEV i2c device (default i2c0)
-     @define TEMOD_TYPE device type (default TEMOD_I2C_R1)
-     -->
-
 <module name="temp_temod" dir="meteo">
   <doc>
     <description>Hygrosens TEMOD-I2C-Rx temperature sensor</description>
-    <define name="SCP_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
+    <configure name="TEMOD_I2C_DEV" value="i2cX" description="select i2c peripheral to use (default i2c0)"/>
     <define name="TEMOD_TYPE" value="type" description="device type (default TEMOD_I2C_R1)"/>
   </doc>
   <header>
@@ -19,6 +13,13 @@
   <periodic fun="temod_periodic()" freq="8"/>
   <event fun="temod_event()"/>
   <makefile target="ap">
+     <raw>
+      TEMOD_DEV ?= i2c0
+      TEMOD_DEV_LOWER=$(shell echo $(TEMOD_DEV) | tr A-Z a-z)
+      TEMOD_DEV_UPPER=$(shell echo $(TEMOD_DEV) | tr a-z A-Z)
+    </raw>
+    <define name="USE_$(TEMOD_DEV_UPPER)"/>
+    <define name="TEMOD_DEV" value="$(TEMOD_DEV_LOWER)"/>
     <file name="temp_temod.c"/>
   </makefile>
 </module>
diff --git a/sw/airborne/modules/enose/enose.h b/sw/airborne/modules/enose/enose.h
index b064810945..fa5b16cba3 100644
--- a/sw/airborne/modules/enose/enose.h
+++ b/sw/airborne/modules/enose/enose.h
@@ -3,13 +3,6 @@
 
 #include "std.h"
 
-#ifdef ENOSE
-#if !defined USE_I2C && !defined SITL
-#define USE_I2C
-#endif
-#endif
-
-
 #define ENOSE_NB_SENSOR 3
 
 extern uint8_t enose_heat[ENOSE_NB_SENSOR];