diff --git a/conf/autopilot/conf_booz2.makefile b/conf/autopilot/conf_booz2.makefile
index ea1785a050..3c393f77f8 100644
--- a/conf/autopilot/conf_booz2.makefile
+++ b/conf/autopilot/conf_booz2.makefile
@@ -110,12 +110,12 @@ ctl.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
 
 ctl.srcs += $(BOOZ_PRIV)/booz2_imu_v3.c $(BOOZ_PRIV_ARCH)/booz2_imu_v3_hw.c
 
-ctl.CFLAGS += -DBOOZ_ANALOG_BARO_LED=5 -DBOOZ_ANALOG_BARO_PERIOD='SYS_TICS_OF_SEC((1./100.))'
-ctl.srcs += $(BOOZ_PRIV)/booz_analog_baro.c
+ctl.CFLAGS += -DBOOZ2_ANALOG_BARO_LED=5 -DBOOZ2_ANALOG_BARO_PERIOD='SYS_TICS_OF_SEC((1./100.))'
+ctl.srcs += $(BOOZ_PRIV)/booz2_analog_baro.c
 
+ctl.srcs += $(BOOZ_PRIV)/booz2_autopilot.c
 ctl.srcs += $(BOOZ_PRIV)/booz_stabilization_euler_int.c
 ctl.srcs += $(BOOZ_PRIV)/booz_supervision_int.c
-ctl.srcs += $(BOOZ_PRIV)/booz2_autopilot.c
 
 
 #
diff --git a/conf/settings/settings_booz2.xml b/conf/settings/settings_booz2.xml
index ae512e3e4d..a60f36e29b 100644
--- a/conf/settings/settings_booz2.xml
+++ b/conf/settings/settings_booz2.xml
@@ -4,7 +4,7 @@
   <dl_settings>
 
     <dl_settings NAME="Analog Baro">
-      <dl_setting var="booz_analog_baro_offset" min="1" step="1" max="1022" module="booz_analog_baro" handler="SetOffset" shortname="offset"/>
+      <dl_setting var="booz2_analog_baro_offset" min="1" step="1" max="1022" module="booz2_analog_baro" handler="SetOffset" shortname="offset"/>
     </dl_settings>
 
   </dl_settings>