diff --git a/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c b/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
index b20c2ccef4..d6dafcbc96 100644
--- a/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
+++ b/sw/airborne/booz/test/booz2_test_buss_bldc_hexa.c
@@ -59,7 +59,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   int_enable();
 }
diff --git a/sw/airborne/booz/test/booz2_test_crista.c b/sw/airborne/booz/test/booz2_test_crista.c
index 5679714380..aea5246116 100644
--- a/sw/airborne/booz/test/booz2_test_crista.c
+++ b/sw/airborne/booz/test/booz2_test_crista.c
@@ -53,7 +53,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/booz/test/booz2_test_gps.c b/sw/airborne/booz/test/booz2_test_gps.c
index 0c67b7886a..1b68e5cb93 100644
--- a/sw/airborne/booz/test/booz2_test_gps.c
+++ b/sw/airborne/booz/test/booz2_test_gps.c
@@ -47,7 +47,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   booz_gps_init();
diff --git a/sw/airborne/booz/test/booz2_test_led.c b/sw/airborne/booz/test/booz2_test_led.c
index 126358b6b4..6426fa308c 100644
--- a/sw/airborne/booz/test/booz2_test_led.c
+++ b/sw/airborne/booz/test/booz2_test_led.c
@@ -43,7 +43,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   int_enable();
 }
diff --git a/sw/airborne/booz/test/booz2_test_max1168.c b/sw/airborne/booz/test/booz2_test_max1168.c
index 12c858a824..31a07ff404 100644
--- a/sw/airborne/booz/test/booz2_test_max1168.c
+++ b/sw/airborne/booz/test/booz2_test_max1168.c
@@ -56,7 +56,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
 
   main_init_ssp();
diff --git a/sw/airborne/booz/test/booz2_test_micromag.c b/sw/airborne/booz/test/booz2_test_micromag.c
index f908c1aefb..f60463c04b 100644
--- a/sw/airborne/booz/test/booz2_test_micromag.c
+++ b/sw/airborne/booz/test/booz2_test_micromag.c
@@ -58,7 +58,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/booz/test/booz2_test_modem.c b/sw/airborne/booz/test/booz2_test_modem.c
index 517fcf2145..6023e7c42c 100644
--- a/sw/airborne/booz/test/booz2_test_modem.c
+++ b/sw/airborne/booz/test/booz2_test_modem.c
@@ -47,7 +47,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   uart1_init_tx();
diff --git a/sw/airborne/booz/test/booz2_test_rc.c b/sw/airborne/booz/test/booz2_test_rc.c
index 24cc7fc6f4..f8a5a7bb50 100644
--- a/sw/airborne/booz/test/booz2_test_rc.c
+++ b/sw/airborne/booz/test/booz2_test_rc.c
@@ -52,7 +52,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/booz/test/booz2_test_usb.c b/sw/airborne/booz/test/booz2_test_usb.c
index c694603709..61954681f9 100644
--- a/sw/airborne/booz/test/booz2_test_usb.c
+++ b/sw/airborne/booz/test/booz2_test_usb.c
@@ -51,7 +51,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/booz/test/booz2_tunnel_bb.c b/sw/airborne/booz/test/booz2_tunnel_bb.c
index 33f8b7ff65..ef845943a6 100644
--- a/sw/airborne/booz/test/booz2_tunnel_bb.c
+++ b/sw/airborne/booz/test/booz2_tunnel_bb.c
@@ -34,7 +34,7 @@
 #define RXD1_PIN 9
 
 int main (int argc, char** argv) {
-  hw_init();
+  mcu_init();
   led_init();
 
   /* TXD0 and TXD1 output */
diff --git a/sw/airborne/booz/test/booz_test_imu.c b/sw/airborne/booz/test/booz_test_imu.c
index 93a0153770..c052986a77 100644
--- a/sw/airborne/booz/test/booz_test_imu.c
+++ b/sw/airborne/booz/test/booz_test_imu.c
@@ -56,7 +56,7 @@ int main( void ) {
 
 static inline void main_init( void ) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   imu_init();
 
diff --git a/sw/airborne/booz/test/booz_test_telemetry.c b/sw/airborne/booz/test/booz_test_telemetry.c
index 940952d9fd..147651487b 100644
--- a/sw/airborne/booz/test/booz_test_telemetry.c
+++ b/sw/airborne/booz/test/booz_test_telemetry.c
@@ -45,7 +45,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   int_enable();
 }
diff --git a/sw/airborne/csc/csc_ap_main.c b/sw/airborne/csc/csc_ap_main.c
index a36956e250..d33f5853e1 100644
--- a/sw/airborne/csc/csc_ap_main.c
+++ b/sw/airborne/csc/csc_ap_main.c
@@ -141,7 +141,7 @@ static void on_gpspos_cmd( struct CscGPSPosMsg *msg )
 
 static void csc_main_init( void ) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/csc/mercury_main.c b/sw/airborne/csc/mercury_main.c
index 53d06949d3..ab5742ee9d 100644
--- a/sw/airborne/csc/mercury_main.c
+++ b/sw/airborne/csc/mercury_main.c
@@ -105,7 +105,7 @@ static void on_rc_cmd(struct CscRCMsg *msg)
 
 static inline void csc_main_init( void ) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/csc/ppm_bridge_main.c b/sw/airborne/csc/ppm_bridge_main.c
index 6219df892a..18abf2bb0e 100644
--- a/sw/airborne/csc/ppm_bridge_main.c
+++ b/sw/airborne/csc/ppm_bridge_main.c
@@ -52,7 +52,7 @@ static uint16_t cpu_time = 0;
 
 static void csc_main_init( void ) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/firmwares/beth/main_beth.c b/sw/airborne/firmwares/beth/main_beth.c
index 42da9633e3..f5a570ea0c 100644
--- a/sw/airborne/firmwares/beth/main_beth.c
+++ b/sw/airborne/firmwares/beth/main_beth.c
@@ -24,7 +24,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   int_enable();
 }
diff --git a/sw/airborne/firmwares/beth/main_coders.c b/sw/airborne/firmwares/beth/main_coders.c
index 31e873270d..ab6e456a9c 100644
--- a/sw/airborne/firmwares/beth/main_coders.c
+++ b/sw/airborne/firmwares/beth/main_coders.c
@@ -73,7 +73,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_init_adc();
   bench_sensors_init();
diff --git a/sw/airborne/firmwares/motor_bench/main_turntable.c b/sw/airborne/firmwares/motor_bench/main_turntable.c
index d170077efc..ac6e62d895 100644
--- a/sw/airborne/firmwares/motor_bench/main_turntable.c
+++ b/sw/airborne/firmwares/motor_bench/main_turntable.c
@@ -32,7 +32,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_init_tacho();
   int_enable();
diff --git a/sw/airborne/firmwares/tutorial/main_demo2.c b/sw/airborne/firmwares/tutorial/main_demo2.c
index 005b76e505..d4a475eb3c 100644
--- a/sw/airborne/firmwares/tutorial/main_demo2.c
+++ b/sw/airborne/firmwares/tutorial/main_demo2.c
@@ -17,7 +17,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 }
diff --git a/sw/airborne/firmwares/tutorial/main_demo3.c b/sw/airborne/firmwares/tutorial/main_demo3.c
index 29ae419e12..3beed62276 100644
--- a/sw/airborne/firmwares/tutorial/main_demo3.c
+++ b/sw/airborne/firmwares/tutorial/main_demo3.c
@@ -19,7 +19,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   uart0_init_tx();
diff --git a/sw/airborne/firmwares/tutorial/main_demo6.c b/sw/airborne/firmwares/tutorial/main_demo6.c
index af9d8f777a..126a3fc1fa 100644
--- a/sw/airborne/firmwares/tutorial/main_demo6.c
+++ b/sw/airborne/firmwares/tutorial/main_demo6.c
@@ -21,7 +21,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   usb_serial_init();
diff --git a/sw/airborne/firmwares/vor/lpc_vor_main.c b/sw/airborne/firmwares/vor/lpc_vor_main.c
index e92ec6392f..462a06a045 100644
--- a/sw/airborne/firmwares/vor/lpc_vor_main.c
+++ b/sw/airborne/firmwares/vor/lpc_vor_main.c
@@ -86,7 +86,7 @@ static inline void main_report( void ) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   uart0_init();
diff --git a/sw/airborne/firmwares/wind_tunnel/main.c b/sw/airborne/firmwares/wind_tunnel/main.c
index e9c44f1922..0288cbac8b 100644
--- a/sw/airborne/firmwares/wind_tunnel/main.c
+++ b/sw/airborne/firmwares/wind_tunnel/main.c
@@ -38,7 +38,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   uart0_init();
diff --git a/sw/airborne/firmwares/wind_tunnel/main_mb.c b/sw/airborne/firmwares/wind_tunnel/main_mb.c
index 8de149b427..f91a366af4 100644
--- a/sw/airborne/firmwares/wind_tunnel/main_mb.c
+++ b/sw/airborne/firmwares/wind_tunnel/main_mb.c
@@ -37,7 +37,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   uart0_init();
diff --git a/sw/airborne/fms/lpc_test_spi.c b/sw/airborne/fms/lpc_test_spi.c
index 9ca9f5b902..328d836bbc 100644
--- a/sw/airborne/fms/lpc_test_spi.c
+++ b/sw/airborne/fms/lpc_test_spi.c
@@ -50,7 +50,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_spi_init();
   int_enable();
diff --git a/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c b/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
index 5a115a0c74..f6c28b1652 100644
--- a/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
+++ b/sw/airborne/lisa/lisa_stm_gps_passthrough_main.c
@@ -91,7 +91,7 @@ int main(void) {
 
 static inline void main_init(void) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   overo_link_init();
 
diff --git a/sw/airborne/lisa/stm_test_spi_link.c b/sw/airborne/lisa/stm_test_spi_link.c
index 0f5ae21ae5..143197ddd3 100644
--- a/sw/airborne/lisa/stm_test_spi_link.c
+++ b/sw/airborne/lisa/stm_test_spi_link.c
@@ -42,7 +42,7 @@ static inline void on_overo_link_lost(void);
 
 int main(void) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   overo_link_init();
   DEBUG_SERVO1_INIT();
diff --git a/sw/airborne/lisa/test/lisa_test_actuators_mkk.c b/sw/airborne/lisa/test/lisa_test_actuators_mkk.c
index 2c5a646ebc..ae6563fdef 100644
--- a/sw/airborne/lisa/test/lisa_test_actuators_mkk.c
+++ b/sw/airborne/lisa/test/lisa_test_actuators_mkk.c
@@ -49,7 +49,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   actuators_init();
 }
diff --git a/sw/airborne/lisa/test/lisa_test_adxl345.c b/sw/airborne/lisa/test/lisa_test_adxl345.c
index 40f6bd8906..83a2b495fc 100644
--- a/sw/airborne/lisa/test/lisa_test_adxl345.c
+++ b/sw/airborne/lisa/test/lisa_test_adxl345.c
@@ -63,7 +63,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_init_hw();
 
diff --git a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
index 20dfd6f70b..6128313cde 100644
--- a/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
+++ b/sw/airborne/lisa/test/lisa_test_adxl345_dma.c
@@ -58,7 +58,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_init_hw();
 
diff --git a/sw/airborne/lisa/test/lisa_test_aspirin.c b/sw/airborne/lisa/test/lisa_test_aspirin.c
index 4f7cbecbb3..258383fb36 100644
--- a/sw/airborne/lisa/test/lisa_test_aspirin.c
+++ b/sw/airborne/lisa/test/lisa_test_aspirin.c
@@ -60,7 +60,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_init_hw();
 
diff --git a/sw/airborne/lisa/test/lisa_test_max1168.c b/sw/airborne/lisa/test/lisa_test_max1168.c
index af7bc514c9..c5b04a23cd 100644
--- a/sw/airborne/lisa/test/lisa_test_max1168.c
+++ b/sw/airborne/lisa/test/lisa_test_max1168.c
@@ -54,7 +54,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   max1168_init();
   main_spi2_init();
diff --git a/sw/airborne/lisa/test/lisa_test_ms2001.c b/sw/airborne/lisa/test/lisa_test_ms2001.c
index 1eb0342e80..ff810e10aa 100644
--- a/sw/airborne/lisa/test/lisa_test_ms2001.c
+++ b/sw/airborne/lisa/test/lisa_test_ms2001.c
@@ -54,7 +54,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   ms2001_init();
   main_spi2_init();
diff --git a/sw/airborne/lisa/test/lisa_test_ms2100.c b/sw/airborne/lisa/test/lisa_test_ms2100.c
index cedf7cacd2..319d18e898 100644
--- a/sw/airborne/lisa/test/lisa_test_ms2100.c
+++ b/sw/airborne/lisa/test/lisa_test_ms2100.c
@@ -54,7 +54,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   max1168_init();
   main_spi2_init();
diff --git a/sw/airborne/lisa/test/lisa_test_sc18is600.c b/sw/airborne/lisa/test/lisa_test_sc18is600.c
index 044ba8cad3..58aec41367 100644
--- a/sw/airborne/lisa/test/lisa_test_sc18is600.c
+++ b/sw/airborne/lisa/test/lisa_test_sc18is600.c
@@ -51,7 +51,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   sc18is600_init();
   main_spi2_init();
diff --git a/sw/airborne/lisa/test/lisa_tunnel.c b/sw/airborne/lisa/test/lisa_tunnel.c
index 1a7bec287a..48c5072eca 100644
--- a/sw/airborne/lisa/test/lisa_tunnel.c
+++ b/sw/airborne/lisa/test/lisa_tunnel.c
@@ -44,7 +44,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
 }
 
diff --git a/sw/airborne/lisa/test/test_board.c b/sw/airborne/lisa/test/test_board.c
index 292fb22bca..603f6ec155 100644
--- a/sw/airborne/lisa/test/test_board.c
+++ b/sw/airborne/lisa/test/test_board.c
@@ -98,7 +98,7 @@ int main( void ) {
 
 static inline void main_init( void ) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
 
diff --git a/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c b/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
index be1a213223..be041919ae 100644
--- a/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
+++ b/sw/airborne/lisa/test/test_mc_asctec_v1_simple.c
@@ -51,7 +51,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
 }
 
diff --git a/sw/airborne/lisa/test_datalink.c b/sw/airborne/lisa/test_datalink.c
index 2315f1370f..3ef1db76a4 100644
--- a/sw/airborne/lisa/test_datalink.c
+++ b/sw/airborne/lisa/test_datalink.c
@@ -47,7 +47,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
 }
 
diff --git a/sw/airborne/lisa/test_float.c b/sw/airborne/lisa/test_float.c
index 0188012ca9..546eacabcb 100644
--- a/sw/airborne/lisa/test_float.c
+++ b/sw/airborne/lisa/test_float.c
@@ -43,7 +43,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
 }
 
diff --git a/sw/airborne/lisa/test_mc.c b/sw/airborne/lisa/test_mc.c
index fa6f1a3d3c..144294f7e2 100644
--- a/sw/airborne/lisa/test_mc.c
+++ b/sw/airborne/lisa/test_mc.c
@@ -55,7 +55,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_i2c_init();
   test_gpios();
diff --git a/sw/airborne/lisa/test_periodic.c b/sw/airborne/lisa/test_periodic.c
index 40f8c1371f..e88929ce8c 100644
--- a/sw/airborne/lisa/test_periodic.c
+++ b/sw/airborne/lisa/test_periodic.c
@@ -43,7 +43,7 @@ int main(void) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
 }
 
diff --git a/sw/airborne/lisa/test_spi_slave.c b/sw/airborne/lisa/test_spi_slave.c
index 001219a8e4..9ffd6445ea 100644
--- a/sw/airborne/lisa/test_spi_slave.c
+++ b/sw/airborne/lisa/test_spi_slave.c
@@ -51,7 +51,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_spi_slave_init();
 }
diff --git a/sw/airborne/lisa/test_spi_slave2.c b/sw/airborne/lisa/test_spi_slave2.c
index 75c5e8ecc8..f2469b2aae 100644
--- a/sw/airborne/lisa/test_spi_slave2.c
+++ b/sw/airborne/lisa/test_spi_slave2.c
@@ -59,7 +59,7 @@ int main(void) {
 
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   main_spi_slave_init();
 }
diff --git a/sw/airborne/lisa/tunnel_hw.c b/sw/airborne/lisa/tunnel_hw.c
index 0d9770e05b..02ba9179e5 100644
--- a/sw/airborne/lisa/tunnel_hw.c
+++ b/sw/airborne/lisa/tunnel_hw.c
@@ -52,7 +52,7 @@ void Delay(__IO uint32_t nCount) {
 
 int main(void) {
 
-  hw_init();
+  mcu_init();
   sys_time_init();
 
 
diff --git a/sw/airborne/sd_card/main.c b/sw/airborne/sd_card/main.c
index a77f922b58..213373dc45 100644
--- a/sw/airborne/sd_card/main.c
+++ b/sw/airborne/sd_card/main.c
@@ -34,7 +34,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
   sys_time_init();
   led_init();
   Uart0Init();
diff --git a/sw/airborne/test/nova_test_imu.c b/sw/airborne/test/nova_test_imu.c
index f2a4affbbb..137613407e 100644
--- a/sw/airborne/test/nova_test_imu.c
+++ b/sw/airborne/test/nova_test_imu.c
@@ -25,7 +25,7 @@ int main( void ) {
 }
 
 static inline void main_init( void ) {
-  hw_init();
+  mcu_init();
 
   sys_time_init();