diff --git a/conf/airframes/examples/demo.xml b/conf/airframes/examples/demo.xml
index f9924086b0..e704d9b1fb 100644
--- a/conf/airframes/examples/demo.xml
+++ b/conf/airframes/examples/demo.xml
@@ -65,7 +65,7 @@ demo4.srcs += $(SRC_ARCH)/armVIC.c
 demo4.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 demo4.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-demo4.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+demo4.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 demo4.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 #
@@ -88,10 +88,10 @@ demo5.srcs += $(SRC_ARCH)/armVIC.c
 demo5.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 demo5.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-demo5.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+demo5.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 demo5.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-demo5.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+demo5.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 
 
 #
@@ -117,7 +117,7 @@ demo6.srcs += $(SRC_ARCH)/usb_ser_hw.c
 demo6.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UsbS
 demo6.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-//demo6.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+//demo6.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 
 
 
diff --git a/conf/airframes/obsolete/Poine/antenna.xml b/conf/airframes/obsolete/Poine/antenna.xml
index 8ac39889a6..c51a7ef2e2 100644
--- a/conf/airframes/obsolete/Poine/antenna.xml
+++ b/conf/airframes/obsolete/Poine/antenna.xml
@@ -28,15 +28,15 @@ ant.CFLAGS += -DUSE_LED
 ant.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 ant.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-ant.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+ant.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 ant.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-ant.CFLAGS += -DDOWNLINK_AP_DEVICE=Uart0 -DAP
-ant.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+ant.CFLAGS += -DDOWNLINK_AP_DEVICE=UART0 -DAP
+ant.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 ant.srcs += datalink.c
 ant.srcs += subsystems/navigation/traffic_info.c
 
-ant.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600
+ant.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B9600
 ant.srcs += estimator.c gps_ubx.c gps.c
 
 ant.srcs += avr/ant_tracker.c
diff --git a/conf/airframes/obsolete/Poine/beth.xml b/conf/airframes/obsolete/Poine/beth.xml
index 5ff67501f9..79ae638b1d 100644
--- a/conf/airframes/obsolete/Poine/beth.xml
+++ b/conf/airframes/obsolete/Poine/beth.xml
@@ -113,7 +113,7 @@ main_stm32.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 
 main_stm32.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600
 main_stm32.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-main_stm32.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2
+main_stm32.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART2
 main_stm32.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 
@@ -183,7 +183,7 @@ main_coders.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
 
 main_coders.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 main_coders.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-main_coders.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+main_coders.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 main_coders.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 #main_coders.CFLAGS += -DUSE_I2C2
@@ -252,11 +252,11 @@ overo_test_uart.srcs    += $(SRC_FMS)/udp_transport2.c subsystems/datalink/downl
 overo_test_uart.srcs    += $(SRC_FMS)/fms_network.c
 overo_test_uart.LDFLAGS += -levent -lm
 overo_test_uart.srcs    += $(SRC_BETH)/overo_gcs_com.c
-#overo_test_uart.CFLAGS  += -DUBX -DUSE_GPS -DUSE_UART0 -DUART0_BAUD=B9600 -DGPS_CONFIGURE -DUSER_GPS_CONFIGURE=\"modules/gps_i2c/runtime_configure.h\" -DGPS_BAUD=B38400 -DGPS_LINK=Uart0 -DGPS_USE_LATLONG
-#overo_test_uart.CFLAGS  += -DUBX -DUSE_GPS -DUSE_UART0 -DUART0_BAUD=B9600 -DGPS_CONFIGURE -DGPS_BAUD=B38400 -DGPS_LINK=Uart0 -DGPS_USE_LATLONG
-overo_test_uart.CFLAGS  += -DUBX -DUSE_GPS -DUSE_UART0 -DUART0_BAUD=B38400 -DGPS_LINK=Uart0 -DGPS_USE_LATLONG
+#overo_test_uart.CFLAGS  += -DUBX -DUSE_GPS -DUSE_UART0 -DUART0_BAUD=B9600 -DGPS_CONFIGURE -DUSER_GPS_CONFIGURE=\"modules/gps_i2c/runtime_configure.h\" -DGPS_BAUD=B38400 -DGPS_LINK=UART0 -DGPS_USE_LATLONG
+#overo_test_uart.CFLAGS  += -DUBX -DUSE_GPS -DUSE_UART0 -DUART0_BAUD=B9600 -DGPS_CONFIGURE -DGPS_BAUD=B38400 -DGPS_LINK=UART0 -DGPS_USE_LATLONG
+overo_test_uart.CFLAGS  += -DUBX -DUSE_GPS -DUSE_UART0 -DUART0_BAUD=B38400 -DGPS_LINK=UART0 -DGPS_USE_LATLONG
 overo_test_uart.srcs    += gps_ubx.c gps.c latlong.c $(SRC_BETH)/uart_hw.c
-overo_test_uart.CFLAGS  +=-DUSE_UART1 -DUART1_BAUD=B57600 -DDOWNLINK_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ
+overo_test_uart.CFLAGS  +=-DUSE_UART1 -DUART1_BAUD=B57600 -DDOWNLINK_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ
 overo_test_uart.srcs    += subsystems/datalink/pprz_transport.c $(SRC_BETH)/rcv_telemetry.c
 
 #
diff --git a/conf/airframes/obsolete/Poine/bl_mc.xml b/conf/airframes/obsolete/Poine/bl_mc.xml
index 84a93893d8..8357860fa0 100644
--- a/conf/airframes/obsolete/Poine/bl_mc.xml
+++ b/conf/airframes/obsolete/Poine/bl_mc.xml
@@ -32,7 +32,7 @@ main.CFLAGS += -DUSE_LED
 main.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 main.srcs += $(SRC_ARCH)/bl_mc_power.c
diff --git a/conf/airframes/obsolete/Poine/easy_glider1.xml b/conf/airframes/obsolete/Poine/easy_glider1.xml
index 1797fa0ae6..80e35fcd6c 100644
--- a/conf/airframes/obsolete/Poine/easy_glider1.xml
+++ b/conf/airframes/obsolete/Poine/easy_glider1.xml
@@ -171,7 +171,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # transparent
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -180,7 +180,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/Poine/motor_bench.xml b/conf/airframes/obsolete/Poine/motor_bench.xml
index 5f5036c767..3b5fc7a18e 100644
--- a/conf/airframes/obsolete/Poine/motor_bench.xml
+++ b/conf/airframes/obsolete/Poine/motor_bench.xml
@@ -23,10 +23,10 @@ main.srcs += $(SRC_ARCH)/armVIC.c
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 
 main.srcs += $(MB)/mb_servo.c
 
diff --git a/conf/airframes/obsolete/Poine/pt_ant.xml b/conf/airframes/obsolete/Poine/pt_ant.xml
index 6bc7224117..8efe0a9614 100644
--- a/conf/airframes/obsolete/Poine/pt_ant.xml
+++ b/conf/airframes/obsolete/Poine/pt_ant.xml
@@ -33,10 +33,10 @@ main.srcs += $(SRC_ARCH)/armVIC.c
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c $(PT_ANT)/pt_ant_telemetry.c
 
-main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+main.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 main.srcs += $(PT_ANT)/pt_ant_datalink.c
 
 main.srcs += $(PT_ANT)/pt_ant_motors.c
@@ -47,7 +47,7 @@ main.srcs += AMI601.c i2c.c $(SRC_ARCH)/i2c_hw.c
 #main.srcs += pt_ant_estimator.c
 
 main.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B9600
-#main.CFLAGS += -DUSE_GPS -DUBX -DGPS_LINK=Uart1
+#main.CFLAGS += -DUSE_GPS -DUBX -DGPS_LINK=UART1
 #main.CFLAGS += -DGPS_USER_CALLBACK=pt_ant_estimator_update_self_gps -DGPS_USER_CALLBACK_HEADER=\"pt_ant_estimator.h\"
 #main.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 #main.srcs += gps_ubx.c gps.c
diff --git a/conf/airframes/obsolete/autoplato.xml b/conf/airframes/obsolete/autoplato.xml
index 669b4373ef..1018e0693f 100644
--- a/conf/airframes/obsolete/autoplato.xml
+++ b/conf/airframes/obsolete/autoplato.xml
@@ -21,7 +21,7 @@ test_usb.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 #test_usb.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 #test_usb.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 #test_usb.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
diff --git a/conf/airframes/obsolete/dc_mc.xml b/conf/airframes/obsolete/dc_mc.xml
index bb18c3d581..69b51c9cdf 100644
--- a/conf/airframes/obsolete/dc_mc.xml
+++ b/conf/airframes/obsolete/dc_mc.xml
@@ -26,7 +26,7 @@ main.CFLAGS += -DUSE_LED
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 main.srcs +=  $(SRC_ARCH)/dc_mc_link.c
diff --git a/conf/airframes/obsolete/easystar2.xml b/conf/airframes/obsolete/easystar2.xml
index 5faf5489b3..1420ff1cd5 100644
--- a/conf/airframes/obsolete/easystar2.xml
+++ b/conf/airframes/obsolete/easystar2.xml
@@ -191,7 +191,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # Telemetry configuration
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -202,7 +202,7 @@ ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
 # USE_GPS configuration
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN
diff --git a/conf/airframes/obsolete/example.xml b/conf/airframes/obsolete/example.xml
index 941f506e0f..0e123806fd 100644
--- a/conf/airframes/obsolete/example.xml
+++ b/conf/airframes/obsolete/example.xml
@@ -27,11 +27,11 @@ example_gps.srcs += $(SRC_ARCH)/armVIC.c
 example_gps.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 example_gps.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-example_gps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+example_gps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 example_gps.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 example_gps.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B38400
-example_gps.CFLAGS += -DUSE_GPS -DUBX -DGPS_LINK=Uart0 -DDOWNLINK_GPS_DEVICE=Uart0 -DGPS_BAUD=38400
+example_gps.CFLAGS += -DUSE_GPS -DUBX -DGPS_LINK=UART0 -DDOWNLINK_GPS_DEVICE=UART0 -DGPS_BAUD=38400
 example_gps.srcs += gps_ubx.c gps.c latlong.c
 
 
diff --git a/conf/airframes/obsolete/kalscott_easystar.xml b/conf/airframes/obsolete/kalscott_easystar.xml
index 7b656b2183..6b1fb34cb0 100644
--- a/conf/airframes/obsolete/kalscott_easystar.xml
+++ b/conf/airframes/obsolete/kalscott_easystar.xml
@@ -171,7 +171,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # Telemetry configuration
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -182,7 +182,7 @@ ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
 # USE_GPS configuration
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN
diff --git a/conf/airframes/obsolete/microjet5.xml b/conf/airframes/obsolete/microjet5.xml
index 6b51d05834..950e980c51 100644
--- a/conf/airframes/obsolete/microjet5.xml
+++ b/conf/airframes/obsolete/microjet5.xml
@@ -186,7 +186,7 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -195,7 +195,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN
diff --git a/conf/airframes/obsolete/microjet5_tp_auto.xml b/conf/airframes/obsolete/microjet5_tp_auto.xml
index da5b83e908..47a9607118 100644
--- a/conf/airframes/obsolete/microjet5_tp_auto.xml
+++ b/conf/airframes/obsolete/microjet5_tp_auto.xml
@@ -190,10 +190,10 @@ ap.srcs += actuators.c $(SRC_ARCH)/servos_4015_hw.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c latlong.c
 
 
@@ -204,7 +204,7 @@ ap.CFLAGS += -DADC -DUSE_AD0 -DUSE_AD0_2 -DUSE_AD0_3 -DUSE_AD1 -DUSE_AD1_5 -DUSE
 #ap.CFLAGS += -DADC -DUSE_AD0 -DUSE_AD0_1 -DUSE_AD0_2 -DUSE_AD0_3 -DUSE_AD1 -DUSE_AD1_5 -DUSE_AD1_7 -DUSE_AD1_3 -DUSE_AD1_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c
 
diff --git a/conf/airframes/obsolete/microjet6.xml b/conf/airframes/obsolete/microjet6.xml
index 3eb937cfe4..974a42c64a 100644
--- a/conf/airframes/obsolete/microjet6.xml
+++ b/conf/airframes/obsolete/microjet6.xml
@@ -208,11 +208,11 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # API mode
-# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B57600
+# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B57600
 # ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 # transparent
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -223,7 +223,7 @@ ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_4 -DUSE_ADC_6
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/microjetI.xml b/conf/airframes/obsolete/microjetI.xml
index d7ae7794c4..7ee130242f 100644
--- a/conf/airframes/obsolete/microjetI.xml
+++ b/conf/airframes/obsolete/microjetI.xml
@@ -195,11 +195,11 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B19200
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B19200
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 # transparent
-# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 # ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -209,7 +209,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 #ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/microjetII.xml b/conf/airframes/obsolete/microjetII.xml
index e3baa4efa0..66c0a4edfb 100644
--- a/conf/airframes/obsolete/microjetII.xml
+++ b/conf/airframes/obsolete/microjetII.xml
@@ -195,11 +195,11 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B19200
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B19200
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 # transparent
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -209,7 +209,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/microjetIII.xml b/conf/airframes/obsolete/microjetIII.xml
index 00ffb36caf..8da6dbf1fa 100644
--- a/conf/airframes/obsolete/microjetIII.xml
+++ b/conf/airframes/obsolete/microjetIII.xml
@@ -184,11 +184,11 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 # transparent
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -198,7 +198,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 #ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/microjet_raw_makefile.xml b/conf/airframes/obsolete/microjet_raw_makefile.xml
index 5c3c70c1be..c4a1a33b97 100644
--- a/conf/airframes/obsolete/microjet_raw_makefile.xml
+++ b/conf/airframes/obsolete/microjet_raw_makefile.xml
@@ -188,13 +188,13 @@
  ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
  ap.CFLAGS += -DRADIO_CONTROL
  ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
- ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
  ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
  ap.CFLAGS += -DINTER_MCU
  ap.srcs += inter_mcu.c
  ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
  ap.srcs += $(SRC_ARCH)/adc_hw.c
- ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
  ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
  ap.srcs += gps_ubx.c gps.c latlong.c
  ap.CFLAGS += -DUSE_INFRARED
diff --git a/conf/airframes/obsolete/minimag1.xml b/conf/airframes/obsolete/minimag1.xml
index f327b70a57..ab84f3c299 100644
--- a/conf/airframes/obsolete/minimag1.xml
+++ b/conf/airframes/obsolete/minimag1.xml
@@ -186,7 +186,7 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_TYPE=RC_FUTABA
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -195,7 +195,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN
diff --git a/conf/airframes/obsolete/minimag_fs.xml b/conf/airframes/obsolete/minimag_fs.xml
index c2823f4a76..1e739b9bde 100644
--- a/conf/airframes/obsolete/minimag_fs.xml
+++ b/conf/airframes/obsolete/minimag_fs.xml
@@ -193,7 +193,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -203,7 +203,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/extra/press_t.xml b/conf/airframes/obsolete/mm/extra/press_t.xml
index d1988aa006..4faf84cfe5 100644
--- a/conf/airframes/obsolete/mm/extra/press_t.xml
+++ b/conf/airframes/obsolete/mm/extra/press_t.xml
@@ -232,11 +232,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -246,7 +246,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_4
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/extra/rctx.xml b/conf/airframes/obsolete/mm/extra/rctx.xml
index 29adc0da51..83d7cabfe2 100644
--- a/conf/airframes/obsolete/mm/extra/rctx.xml
+++ b/conf/airframes/obsolete/mm/extra/rctx.xml
@@ -32,7 +32,7 @@ ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_rctx.c
 ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_TYPE=RC_FUTABA
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c subsystems/datalink/xbee.c
 
 ap.CFLAGS += -DUSE_DOWNLINK_BROADCAST
diff --git a/conf/airframes/obsolete/mm/fixed-wing/drops.xml b/conf/airframes/obsolete/mm/fixed-wing/drops.xml
index dd0993ade8..d2a9f8e8b0 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/drops.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/drops.xml
@@ -246,11 +246,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_AUTO1
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -262,7 +262,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c
 ap.CFLAGS += -DUSE_GYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjeteth1.xml b/conf/airframes/obsolete/mm/fixed-wing/funjeteth1.xml
index 4c54fc600b..4928f5d23b 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjeteth1.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjeteth1.xml
@@ -209,11 +209,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -222,7 +222,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_6
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400
 # -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjeteth2.xml b/conf/airframes/obsolete/mm/fixed-wing/funjeteth2.xml
index 27783ddc6b..cf0ce0b767 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjeteth2.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjeteth2.xml
@@ -210,11 +210,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -223,7 +223,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_6
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400
 # -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetfmi1.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi1.xml
index 844c5a86c2..16ce49689b 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetfmi1.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi1.xml
@@ -212,11 +212,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -226,7 +226,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetfmi2.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi2.xml
index d5c827238a..f36be614cc 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetfmi2.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi2.xml
@@ -211,11 +211,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -225,7 +225,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetfmi3.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi3.xml
index f7fc7d937a..10a79ee14d 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetfmi3.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetfmi3.xml
@@ -211,11 +211,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -225,7 +225,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi1.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi1.xml
index cedf12a861..2fd8f00ef8 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi1.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi1.xml
@@ -189,11 +189,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -203,7 +203,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi3.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi3.xml
index 9118e22139..2f8ed6e1a9 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi3.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi3.xml
@@ -199,10 +199,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-#TRANSPARENT ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+#TRANSPARENT ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 #TRANSPARENT ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -212,7 +212,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DGPS_LED=2 -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DGPS_LED=2 -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi4.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi4.xml
index f3f1dbd759..0754ece809 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi4.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi4.xml
@@ -189,11 +189,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -203,7 +203,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi5.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi5.xml
index 02b20657bc..bd0c9633df 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi5.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi5.xml
@@ -191,11 +191,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -205,7 +205,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi6.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi6.xml
index bea61ec189..781a7612da 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi6.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi6.xml
@@ -191,11 +191,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -205,7 +205,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi7.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi7.xml
index c3b4bd9501..3ac9d6ac77 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi7.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi7.xml
@@ -191,11 +191,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -205,7 +205,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi9.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi9.xml
index 3a7bd55c36..40aa6b60f9 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetgfi9.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetgfi9.xml
@@ -191,11 +191,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -205,7 +205,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/funjetmm2.xml b/conf/airframes/obsolete/mm/fixed-wing/funjetmm2.xml
index 171e353750..125185ee07 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/funjetmm2.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/funjetmm2.xml
@@ -217,11 +217,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -231,7 +231,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_4
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400
 # -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/mm/fixed-wing/miniwing.xml b/conf/airframes/obsolete/mm/fixed-wing/miniwing.xml
index 0f40cf77fb..bf5bf5c6d0 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/miniwing.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/miniwing.xml
@@ -185,7 +185,7 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL -DUSE_RC_TELEMETRY
 ap.srcs += radio_control.c ppm_telemetry.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -194,7 +194,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/slowfast.xml b/conf/airframes/obsolete/mm/fixed-wing/slowfast.xml
index dab01b605b..806ff5d301 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/slowfast.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/slowfast.xml
@@ -225,11 +225,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -239,7 +239,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml b/conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
index aada26c1ad..ce6d0b7f49 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/slowfast2.xml
@@ -242,11 +242,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -256,7 +256,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/fixed-wing/twinstarmm.xml b/conf/airframes/obsolete/mm/fixed-wing/twinstarmm.xml
index a085813cdb..bcae225f07 100644
--- a/conf/airframes/obsolete/mm/fixed-wing/twinstarmm.xml
+++ b/conf/airframes/obsolete/mm/fixed-wing/twinstarmm.xml
@@ -210,11 +210,11 @@ ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_AUTO1
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 #XBEE
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -223,7 +223,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DWIND_INFO -DWIND_INFO_RET
diff --git a/conf/airframes/obsolete/mm/hangar/black_one.xml b/conf/airframes/obsolete/mm/hangar/black_one.xml
index f1de26639d..2cf389ebab 100644
--- a/conf/airframes/obsolete/mm/hangar/black_one.xml
+++ b/conf/airframes/obsolete/mm/hangar/black_one.xml
@@ -225,10 +225,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_hw_new.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -237,7 +237,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_AD0 -DUSE_AD0_1 -DUSE_AD0_2 -DUSE_AD0_3 -DUSE_AD1 -DUSE_AD1_7 -DUSE_AD1_3 -DUSE_AD1_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
 
 ap.srcs += gps_ubx.c gps.c
 
diff --git a/conf/airframes/obsolete/mm/hangar/glass_one1.xml b/conf/airframes/obsolete/mm/hangar/glass_one1.xml
index af4f444298..b73fdfe67f 100644
--- a/conf/airframes/obsolete/mm/hangar/glass_one1.xml
+++ b/conf/airframes/obsolete/mm/hangar/glass_one1.xml
@@ -215,10 +215,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -227,7 +227,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
 ap.CFLAGS += -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c
diff --git a/conf/airframes/obsolete/mm/hangar/glass_one2.xml b/conf/airframes/obsolete/mm/hangar/glass_one2.xml
index 005382ec2e..33aa5b391f 100644
--- a/conf/airframes/obsolete/mm/hangar/glass_one2.xml
+++ b/conf/airframes/obsolete/mm/hangar/glass_one2.xml
@@ -189,10 +189,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_hw_new.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -201,7 +201,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
 ap.CFLAGS += -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c
diff --git a/conf/airframes/obsolete/mm/hangar/glass_one3.xml b/conf/airframes/obsolete/mm/hangar/glass_one3.xml
index eac23f84cb..2affbd6f2e 100644
--- a/conf/airframes/obsolete/mm/hangar/glass_one3.xml
+++ b/conf/airframes/obsolete/mm/hangar/glass_one3.xml
@@ -216,10 +216,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -228,7 +228,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
 ap.CFLAGS += -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c
diff --git a/conf/airframes/obsolete/mm/hangar/lila.xml b/conf/airframes/obsolete/mm/hangar/lila.xml
index ecb8c46910..fb84254382 100644
--- a/conf/airframes/obsolete/mm/hangar/lila.xml
+++ b/conf/airframes/obsolete/mm/hangar/lila.xml
@@ -213,11 +213,11 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_TYPE=RC_FUTABA
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -229,7 +229,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c
 ap.CFLAGS += -DUSE_GYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400 -DGPS_USE_LATLONG
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/mm/hangar/mac06a.xml b/conf/airframes/obsolete/mm/hangar/mac06a.xml
index 56c419b8fe..2f2ae34a62 100644
--- a/conf/airframes/obsolete/mm/hangar/mac06a.xml
+++ b/conf/airframes/obsolete/mm/hangar/mac06a.xml
@@ -209,10 +209,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#XBEE  ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#XBEE  ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #XBEE  ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -222,7 +222,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c
 
diff --git a/conf/airframes/obsolete/mm/hangar/red_one.xml b/conf/airframes/obsolete/mm/hangar/red_one.xml
index 29aa23effe..f3e89907f9 100644
--- a/conf/airframes/obsolete/mm/hangar/red_one.xml
+++ b/conf/airframes/obsolete/mm/hangar/red_one.xml
@@ -236,10 +236,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -248,7 +248,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400 -DGPS_CONFIGURE -DZ_CONTRAST_DEFAULT=1
 ap.CFLAGS += -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c
diff --git a/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml b/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
index 80234bac77..e4aeb933f8 100644
--- a/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
+++ b/conf/airframes/obsolete/mmlaas_N1_carto_cam.xml
@@ -209,7 +209,7 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_TYPE=RC_FUTABA
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/uart_hw.c datalink.c subsystems/datalink/xbee.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -218,7 +218,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/nova.xml b/conf/airframes/obsolete/nova.xml
index 77816b0aca..5553564396 100644
--- a/conf/airframes/obsolete/nova.xml
+++ b/conf/airframes/obsolete/nova.xml
@@ -13,7 +13,7 @@ timu.srcs = nova_test_imu.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/arm
 
 timu.CFLAGS += -DUSE_LED  -DUSE_LED -DTIME_LED=1
 
-timu.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+timu.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 timu.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c subsystems/datalink/pprz_transport.c
 
 timu.srcs += $(SRC_ARCH)/ADS8344.c
diff --git a/conf/airframes/obsolete/osam_xsens_twog.xml b/conf/airframes/obsolete/osam_xsens_twog.xml
index df45489e19..a2843e3e33 100644
--- a/conf/airframes/obsolete/osam_xsens_twog.xml
+++ b/conf/airframes/obsolete/osam_xsens_twog.xml
@@ -10,7 +10,7 @@
       <define name="WIND_INFO"/>
       <define name="UGEAR"/>
       <define name="UGEAR_LED" value="2"/>
-      <define name="UGEAR_LINK" value="Uart0"/>
+      <define name="UGEAR_LINK" value="UART0"/>
       <define name="USE_UART0"/>
       <define name="UART0_BAUD" value="B115200"/>
     </target>
diff --git a/conf/airframes/obsolete/slayer1.xml b/conf/airframes/obsolete/slayer1.xml
index e860fa51c4..c3c9a8ee80 100644
--- a/conf/airframes/obsolete/slayer1.xml
+++ b/conf/airframes/obsolete/slayer1.xml
@@ -202,10 +202,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600 -DXBEE868
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600 -DXBEE868
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c latlong.c subsystems/datalink/xbee.c
 
-#transp ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+#transp ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 #transp ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -215,7 +215,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_4 -DUSE_ADC_5 -DUSE_ADC_6
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c
 
diff --git a/conf/airframes/obsolete/slayer3.xml b/conf/airframes/obsolete/slayer3.xml
index f2170dc98a..3b1313544b 100644
--- a/conf/airframes/obsolete/slayer3.xml
+++ b/conf/airframes/obsolete/slayer3.xml
@@ -204,10 +204,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-#TRANSPARENT   ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+#TRANSPARENT   ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 #TRANSPARENT ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -217,7 +217,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_AD0 -DUSE_AD0_2 -DUSE_AD0_3 -DUSE_AD1 -DUSE_AD1_3 -DUSE_AD1_5 -DUSE_AD1_2 -DUSE_AD1_4
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c
 
diff --git a/conf/airframes/obsolete/slayerJH.xml b/conf/airframes/obsolete/slayerJH.xml
index c2b95d7065..3fd0a8e19b 100644
--- a/conf/airframes/obsolete/slayerJH.xml
+++ b/conf/airframes/obsolete/slayerJH.xml
@@ -186,11 +186,11 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 #MAXSTREAM
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
 #TRANSPARENT
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -200,7 +200,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_4 -DUSE_ADC_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B57600
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B57600
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/slicer1.xml b/conf/airframes/obsolete/slicer1.xml
index 58dcdf939a..0dfa213dc6 100644
--- a/conf/airframes/obsolete/slicer1.xml
+++ b/conf/airframes/obsolete/slicer1.xml
@@ -199,7 +199,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # Radiotronix
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -211,7 +211,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c
 ap.CFLAGS += -DUSE_GYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600 -DGPS_LED=2 -DDOWNLINK_GPS_1Hz
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B9600 -DGPS_LED=2 -DDOWNLINK_GPS_1Hz
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/slicer2.xml b/conf/airframes/obsolete/slicer2.xml
index 7447249f10..bf91aecf16 100644
--- a/conf/airframes/obsolete/slicer2.xml
+++ b/conf/airframes/obsolete/slicer2.xml
@@ -181,7 +181,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # Radiotronix
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -193,7 +193,7 @@ ap.srcs += $(SRC_ARCH)/adc_hw.c
 ap.CFLAGS += -DUSE_GYRO -DADXRS150
 ap.srcs += gyro.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600 -DGPS_LED=2 -DDOWNLINK_GPS_1Hz
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B9600 -DGPS_LED=2 -DDOWNLINK_GPS_1Hz
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/spirit.xml b/conf/airframes/obsolete/spirit.xml
index bd7977021b..a3f0f763d7 100644
--- a/conf/airframes/obsolete/spirit.xml
+++ b/conf/airframes/obsolete/spirit.xml
@@ -194,7 +194,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # transparent
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -203,7 +203,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_6
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B9600
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/spirit_proto.xml b/conf/airframes/obsolete/spirit_proto.xml
index 991744d719..9e503f6b28 100644
--- a/conf/airframes/obsolete/spirit_proto.xml
+++ b/conf/airframes/obsolete/spirit_proto.xml
@@ -182,7 +182,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += poradio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # transparent
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -191,7 +191,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B9600
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/storm1.xml b/conf/airframes/obsolete/storm1.xml
index 0c3190e39e..582c50bf3b 100644
--- a/conf/airframes/obsolete/storm1.xml
+++ b/conf/airframes/obsolete/storm1.xml
@@ -236,17 +236,17 @@ ap.srcs += $(SRC_ARCH)/servos_4015_hw_new.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -#DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B57600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -#DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B57600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
 
 ap.CFLAGS += -DTELEMETRY_MODE_FBW=1
 
-#TRANSPARENT   ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+#TRANSPARENT   ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 #TRANSPARENT ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -256,7 +256,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B19200
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B19200
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/test_i2c.xml b/conf/airframes/obsolete/test_i2c.xml
index b57e6b9834..9bbfe2bded 100644
--- a/conf/airframes/obsolete/test_i2c.xml
+++ b/conf/airframes/obsolete/test_i2c.xml
@@ -19,10 +19,10 @@ mb.CFLAGS += -DUSE_LED
 mb.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 mb.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-mb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+mb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 mb.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-mb.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+mb.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 
   </makefile>
 
diff --git a/conf/airframes/obsolete/tiny2.xml b/conf/airframes/obsolete/tiny2.xml
index 070808c8bc..73607d4a3a 100644
--- a/conf/airframes/obsolete/tiny2.xml
+++ b/conf/airframes/obsolete/tiny2.xml
@@ -209,10 +209,10 @@ ap.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-#XBEE ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DXBEE_UART=Uart1 -DDATALINK=XBEE -DUART1_BAUD=B57600
+#XBEE ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DXBEE_UART=UART1 -DDATALINK=XBEE -DUART1_BAUD=B57600
 #XBEE ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART1 -DDOWNLINK_AP_DEVICE=UART1 -DPPRZ_UART=UART1 -DDATALINK=PPRZ -DUART1_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -222,7 +222,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_4
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=Uart0 -DUART0_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART0 -DGPS_LINK=UART0 -DUART0_BAUD=B38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
 
diff --git a/conf/airframes/obsolete/tiny_hitl.xml b/conf/airframes/obsolete/tiny_hitl.xml
index c229ed5def..5bc5f33aea 100644
--- a/conf/airframes/obsolete/tiny_hitl.xml
+++ b/conf/airframes/obsolete/tiny_hitl.xml
@@ -174,7 +174,7 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # transparent
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU
@@ -183,7 +183,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/tl.xml b/conf/airframes/obsolete/tl.xml
index c2b1e192d1..aa14e10bf1 100644
--- a/conf/airframes/obsolete/tl.xml
+++ b/conf/airframes/obsolete/tl.xml
@@ -100,13 +100,13 @@ ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
 # transparent
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c subsystems/datalink/pprz_transport.c $(TL)/tl_telemetry.c datalink.c
 
 ap.CFLAGS += -DTL_AP_MODE_AUTO=TL_AP_MODE_NAV -DDT_VFILTER="(1./60.)"
 ap.srcs += $(TL)/tl_autopilot.c $(TL)/tl_control.c $(TL)/tl_estimator.c $(TL)/tl_vfilter.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DDOWNLINK_GPS_DEVICE=DOWNLINK_AP_DEVICE -DGPS_CONFIGURE -DUSER_GPS_CONFIGURE=\"$(TL)/tl_gps_configure.h\" -DGPS_BAUD=38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400 -DDOWNLINK_GPS_DEVICE=DOWNLINK_AP_DEVICE -DGPS_CONFIGURE -DUSER_GPS_CONFIGURE=\"$(TL)/tl_gps_configure.h\" -DGPS_BAUD=38400
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.srcs += $(TL)/tl_imu.c
@@ -134,7 +134,7 @@ tmm.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DPERIODIC_TASK_PERIOD='CPU_TICKS_OF
 tmm.srcs = $(TL)/tl_test_mm_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 tmm.CFLAGS += -DUSE_LED  -DUSE_LED -DTIME_LED=1
-tmm.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DUART0_BAUD=B57600
+tmm.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0 -DPPRZ_UART=UART0 -DUART0_BAUD=B57600
 tmm.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c subsystems/datalink/pprz_transport.c
 
 tmm.srcs += micromag.c $(SRC_ARCH)/micromag_hw.c
@@ -149,7 +149,7 @@ timu.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DPERIODIC_TASK_PERIOD='CPU_TICKS_O
 timu.srcs = $(TL)/tl_test_imu_main.c sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
 
 timu.CFLAGS += -DUSE_LED  -DUSE_LED -DTIME_LED=1
-timu.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DUART0_BAUD=B57600
+timu.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0 -DPPRZ_UART=UART0 -DUART0_BAUD=B57600
 timu.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c subsystems/datalink/pprz_transport.c
 
 timu.srcs += $(TL)/tl_imu.c
diff --git a/conf/airframes/obsolete/twinjet1.xml b/conf/airframes/obsolete/twinjet1.xml
index 0c39819c0d..4e82a14134 100644
--- a/conf/airframes/obsolete/twinjet1.xml
+++ b/conf/airframes/obsolete/twinjet1.xml
@@ -182,7 +182,7 @@ fbw.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 fbw.CFLAGS += -DRADIO_CONTROL
 fbw.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-fbw.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DUART0_BAUD=B9600
+fbw.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DUART0_BAUD=B9600
 fbw.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c $(SRC_ARCH)/mcu_periph/uart_arch.c
 
 fbw.CFLAGS += -DINTER_MCU -DMCU_SPI_LINK -DUSE_SPI -DSPI_SLAVE
@@ -195,16 +195,16 @@ fbw.srcs += $(SRC_ARCH)/adc_hw.c
 ap.CFLAGS += -DAP -DRADIO_CONTROL_AUTO1 -DBOARD_CONFIG=\"classix.h\" -DUSE_LED -DTIME_LED=2
 ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_ap.c main.c
 
-#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 #ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/navigation/traffic_info.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0  -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=UART0  -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU -DMCU_SPI_LINK -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0
 ap.srcs += inter_mcu.c link_mcu_spi.c spi.c $(SRC_ARCH)/spi_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 # ADCs for infrared
@@ -236,7 +236,7 @@ ap.CFLAGS += -DUSE_LIGHT
 
 
 
-test.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DUSE_LED -DTIME_LED=1 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 -DSERVOS_4017_CLOCK_FALLING  -DUSE_UART0 -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=Uart0 -DUART0_BAUD=B9600
+test.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DUSE_LED -DTIME_LED=1 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 -DSERVOS_4017_CLOCK_FALLING  -DUSE_UART0 -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=UART0 -DUART0_BAUD=B9600
 test.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c subsystems/datalink/pprz_transport.c setup_actuators.c $(SRC_ARCH)/mcu_periph/uart_arch.c $(SRC_ARCH)/servos_4017_hw.c main.c
 
 # Config for SITL simulation
diff --git a/conf/airframes/obsolete/twinstar1.xml b/conf/airframes/obsolete/twinstar1.xml
index 5b270a666c..ecc94610cf 100644
--- a/conf/airframes/obsolete/twinstar1.xml
+++ b/conf/airframes/obsolete/twinstar1.xml
@@ -180,12 +180,12 @@ include $(PAPARAZZI_SRC)/conf/firmwares/twin_mcu_avr.makefile
 ap.CFLAGS += -DHITL
 
 # Downlink on uart0
-ap.CFLAGS += -DUSE_UART0 -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0 -DUART0_BAUD=B38400
+ap.CFLAGS += -DUSE_UART0 -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=UART0 -DUART0_BAUD=B38400
 ap.EXTRA_SRCS += subsystems/datalink/pprz_transport.c subsystems/datalink/downlink.c
 
 # Datalink (on uart0) used to emulate sensors (infrared and gps)
 ap.EXTRA_SRCS += subsystems/navigation/traffic_info.c datalink.c
-ap.CFLAGS += -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=Uart0
+ap.CFLAGS += -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=UART0
 
 # Config for SITL simulation
 include $(PAPARAZZI_SRC)/conf/firmwares/sitl.makefile
diff --git a/conf/airframes/obsolete/twinstar6.xml b/conf/airframes/obsolete/twinstar6.xml
index 4bbc84a9f5..6c460dec4a 100644
--- a/conf/airframes/obsolete/twinstar6.xml
+++ b/conf/airframes/obsolete/twinstar6.xml
@@ -191,7 +191,7 @@ fbw.srcs += $(SRC_ARCH)/servos_4017_hw.c actuators.c
 fbw.CFLAGS += -DRADIO_CONTROL
 fbw.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-fbw.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DUART0_BAUD=B9600
+fbw.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DUART0_BAUD=B9600
 fbw.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c $(SRC_ARCH)/mcu_periph/uart_arch.c
 
 fbw.CFLAGS += -DINTER_MCU -DMCU_SPI_LINK -DUSE_SPI -DSPI_SLAVE
@@ -204,13 +204,13 @@ fbw.srcs += $(SRC_ARCH)/adc_hw.c
 ap.CFLAGS += -DAP -DRADIO_CONTROL_AUTO1 -DBOARD_CONFIG=\"classix.h\" -DUSE_LED -DTIME_LED=2
 ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_ap.c main.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0  -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=UART0  -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/navigation/traffic_info.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DINTER_MCU -DMCU_SPI_LINK -DUSE_SPI -DSPI_MASTER
 ap.srcs += inter_mcu.c link_mcu_spi.c spi.c $(SRC_ARCH)/spi_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 # ADCs for infrared
@@ -237,7 +237,7 @@ ap.CFLAGS += -DDIGITAL_CAM
 ap.srcs += dc.c
 
 
-test.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DUSE_LED -DTIME_LED=1 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 -DSERVOS_4017_CLOCK_FALLING  -DUSE_UART0 -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=Uart0 -DUART0_BAUD=B9600
+test.CFLAGS += -DFBW -DBOARD_CONFIG=\"classix.h\" -DUSE_LED -DTIME_LED=1 -DACTUATORS=\"servos_4017_hw.h\" -DSERVOS_4017 -DSERVOS_4017_CLOCK_FALLING  -DUSE_UART0 -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=UART0 -DUART0_BAUD=B9600
 test.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c subsystems/datalink/pprz_transport.c setup_actuators.c $(SRC_ARCH)/mcu_periph/uart_arch.c $(SRC_ARCH)/servos_4017_hw.c main.c
 
 # Config for SITL simulation
diff --git a/conf/airframes/obsolete/twisted.xml b/conf/airframes/obsolete/twisted.xml
index 1a643f9c23..7131008243 100644
--- a/conf/airframes/obsolete/twisted.xml
+++ b/conf/airframes/obsolete/twisted.xml
@@ -55,7 +55,7 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c commands.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B19200
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B19200
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A
diff --git a/conf/airframes/obsolete/tyto1.xml b/conf/airframes/obsolete/tyto1.xml
index ae9ab4706c..8b2564644c 100644
--- a/conf/airframes/obsolete/tyto1.xml
+++ b/conf/airframes/obsolete/tyto1.xml
@@ -214,10 +214,10 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
 # ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/xbee.c
 
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -227,7 +227,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DGPS_CONFIGURE -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600
+ap.CFLAGS += -DUSE_GPS -DGPS_CONFIGURE -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B9600
 ap.CFLAGS += -DGPS_CONFIGURE -DGPS_BAUD=38400
 # -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
diff --git a/conf/airframes/obsolete/vor.xml b/conf/airframes/obsolete/vor.xml
index 0cbeb72a48..6793fa5f24 100644
--- a/conf/airframes/obsolete/vor.xml
+++ b/conf/airframes/obsolete/vor.xml
@@ -23,7 +23,7 @@ main.srcs += firmwares/vor/lpc_vor_convertions.c
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B9600
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 main.srcs += firmwares/vor/vor_int_demod_decim.c
diff --git a/conf/airframes/obsolete/xxx1.xml b/conf/airframes/obsolete/xxx1.xml
index 6941ecca80..0ca8b86873 100644
--- a/conf/airframes/obsolete/xxx1.xml
+++ b/conf/airframes/obsolete/xxx1.xml
@@ -219,11 +219,11 @@ ap.srcs += $(SRC_ARCH)/servos_4015_MAT_hw.c actuators.c
 ap.CFLAGS += -DRADIO_CONTROL
 ap.srcs += radio_control.c $(SRC_ARCH)/ppm_hw.c
 
-# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
-ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
+# ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DXBEE_UART=UART0 -DDATALINK=XBEE -DUART0_BAUD=B9600
+ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
 ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
-#TRANSPARENT   ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
+#TRANSPARENT   ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_FBW_DEVICE=UART0 -DDOWNLINK_AP_DEVICE=UART0 -DPPRZ_UART=UART0 -DDATALINK=PPRZ -DUART0_BAUD=B9600
 #TRANSPARENT ap.srcs += subsystems/datalink/downlink.c $(SRC_ARCH)/mcu_periph/uart_arch.c datalink.c subsystems/datalink/pprz_transport.c
 
 
@@ -233,7 +233,7 @@ ap.srcs += inter_mcu.c
 ap.CFLAGS += -DADC -DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_4 -DUSE_ADC_5
 ap.srcs += $(SRC_ARCH)/adc_hw.c
 
-ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B38400 -DGPS_LED=2
+ap.CFLAGS += -DUSE_GPS -DUBX -DUSE_UART1 -DGPS_LINK=UART1 -DUART1_BAUD=B38400 -DGPS_LED=2
 ap.srcs += gps_ubx.c gps.c latlong.c
 
 ap.CFLAGS += -DUSE_INFRARED -DALT_KALMAN -DIR_360
@@ -277,7 +277,7 @@ sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_re
 # a test program to setup actuators
 setup_actuators.ARCHDIR = $(ARCHI)
 
-setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DUSE_LED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DUSE_LED -DTIME_LED=1 -DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 -DDATALINK=PPRZ -DPPRZ_UART=UART0
 setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c subsystems/datalink/pprz_transport.c setup_actuators.c $(SRC_ARCH)/mcu_periph/uart_arch.c $(SRC_ARCH)/servos_4015_hw.c main.c
 
   </makefile>
diff --git a/conf/airframes/turntable.xml b/conf/airframes/turntable.xml
index b21a2ab290..35af58a2d8 100644
--- a/conf/airframes/turntable.xml
+++ b/conf/airframes/turntable.xml
@@ -26,7 +26,7 @@ main.srcs += mcu_periph/sys_time.c $(MB)/turntable_systime.c
 main.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
 main.srcs += mcu_periph/uart.c
 main.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+main.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 
 main.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
diff --git a/conf/airframes/wind_tunnel.xml b/conf/airframes/wind_tunnel.xml
index 1b083e4313..a38885d6d5 100644
--- a/conf/airframes/wind_tunnel.xml
+++ b/conf/airframes/wind_tunnel.xml
@@ -24,10 +24,10 @@ ap.srcs += $(SRC_ARCH)/armVIC.c
 ap.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 ap.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+ap.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 ap.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-ap.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+ap.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 #ap.srcs += $(BOOZ)/booz_datalink.c
 
 ap.srcs += $(WIND_TUNNEL)/wt_servo.c
@@ -54,10 +54,10 @@ mb.srcs += $(SRC_ARCH)/armVIC.c
 mb.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
 mb.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-mb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+mb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 mb.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
-mb.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
+mb.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART0
 
 mb.srcs += $(WIND_TUNNEL)/wt_servo.c
 
diff --git a/conf/firmwares/booz2_test_progs.makefile b/conf/firmwares/booz2_test_progs.makefile
index 0e2ff69a1d..827feb9d29 100644
--- a/conf/firmwares/booz2_test_progs.makefile
+++ b/conf/firmwares/booz2_test_progs.makefile
@@ -52,7 +52,7 @@ test_downlink.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_downlink.srcs   += mcu_periph/uart.c
 test_downlink.srcs   += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_downlink.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_downlink.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_downlink.srcs   += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 
@@ -72,7 +72,7 @@ test_max1168.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_max1168.srcs   += mcu_periph/uart.c
 test_max1168.srcs   += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_max1168.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_max1168.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_max1168.srcs   += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_max1168.CFLAGS += -DMAX1168_EOC_VIC_SLOT=11
@@ -94,7 +94,7 @@ test_micromag.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_micromag.srcs += mcu_periph/uart.c
 test_micromag.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_micromag.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_micromag.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_micromag.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 #test_micromag.CFLAGS += -I$(BOOZ)
@@ -174,11 +174,11 @@ test_gps.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_gps.srcs += mcu_periph/uart.c
 test_gps.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_gps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_gps.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_gps.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_gps.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B38400
-test_gps.CFLAGS += -DGPS_LINK=Uart0 -DGPS_LED=2
+test_gps.CFLAGS += -DGPS_LINK=UART0 -DGPS_LED=2
 test_gps.srcs += $(SRC_BOOZ)/booz2_gps.c
 
 
@@ -200,7 +200,7 @@ test_modem.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_modem.srcs += mcu_periph/uart.c
 test_modem.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_modem.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_modem.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_modem.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 #test_modem.CFLAGS += -DBOOZ_ANALOG_BARO_LED=2 -DBOOZ_ANALOG_BARO_PERIOD='CPU_TICKS_OF_SEC((1./100.))'
@@ -223,7 +223,7 @@ test_usb.srcs += mcu.c $(SRC_ARCH)/mcu_arch.c
 #test_usb.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 #test_usb.srcs += mcu_periph/uart.c
 #test_usb.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+#test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 #test_usb.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_usb.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
@@ -253,7 +253,7 @@ test_ami.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_ami.srcs += mcu_periph/uart.c
 test_ami.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_ami.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_ami.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_ami.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_ami.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_BUF_LEN=16
@@ -277,7 +277,7 @@ test_crista.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B57600
 test_crista.srcs += mcu_periph/uart.c
 test_crista.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_crista.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart0
+test_crista.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART0
 test_crista.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_crista.CFLAGS += -DFLOAT_T=float -DBOOZ2_IMU_TYPE=\"booz2_imu_crista.h\"
@@ -303,7 +303,7 @@ test_micromag2.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_micromag2.srcs += mcu_periph/uart.c
 test_micromag2.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_micromag2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_micromag2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_micromag2.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 
@@ -326,7 +326,7 @@ test_imu_b2.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_imu_b2.srcs += mcu_periph/uart.c
 test_imu_b2.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_imu_b2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_imu_b2.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_imu_b2.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_imu_b2.srcs += $(SRC_BOOZ)/booz_trig_int.c
@@ -355,7 +355,7 @@ test_rc_spektrum.srcs += mcu_periph/sys_time.c $(SRC_ARCH)/mcu_periph/sys_time_a
 #test_rc_spektrum.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 #test_rc_spektrum.srcs += mcu_periph/uart.c
 #test_rc_spektrum.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-#test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+#test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 #test_rc_spektrum.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 test_rc_spektrum.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
 test_rc_spektrum.CFLAGS += -DDOWNLINK_DEVICE=UsbS -DPPRZ_UART=UsbS -DDATALINK=PPRZ
@@ -367,7 +367,7 @@ test_rc_spektrum.CFLAGS += -DRADIO_CONTROL -DRADIO_CONTROL_LED=1
 test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_TYPE_H=\"booz_radio_control_spektrum.h\"
 test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_SPEKTRUM_MODEL_H=\"booz_radio_control_spektrum_dx7se.h\"
 test_rc_spektrum.CFLAGS += -DUSE_UART0 -DUART0_BAUD=B115200
-test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LINK=Uart0
+test_rc_spektrum.CFLAGS += -DRADIO_CONTROL_LINK=UART0
 test_rc_spektrum.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
 						 $(SRC_SUBSYSTEMS)/radio_control_spektrum.c \
 						 mcu_periph/uart.c \
@@ -388,7 +388,7 @@ test_rc_ppm.srcs += mcu_periph/sys_time.c $(SRC_ARCH)/mcu_periph/sys_time_arch.c
 
 #test_rc_ppm.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 #test_rc_ppm.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
-#test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+#test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 #test_rc_ppm.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 test_rc_ppm.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DUSE_USB_SERIAL
 test_rc_ppm.CFLAGS += -DDOWNLINK_DEVICE=UsbS -DPPRZ_UART=UsbS -DDATALINK=PPRZ
@@ -419,7 +419,7 @@ test_mc.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_mc.srcs += mcu_periph/uart.c
 test_mc.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_mc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_mc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_mc.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_mc.CFLAGS += -DACTUATORS=\"actuators_buss_twi_blmc_hw.h\" -DUSE_BUSS_TWI_BLMC
@@ -445,7 +445,7 @@ test_buss_bldc.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_buss_bldc.srcs += mcu_periph/uart.c
 test_buss_bldc.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_buss_bldc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_buss_bldc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_buss_bldc.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_buss_bldc.CFLAGS += -DUSE_I2C0 -DI2C0_SCLL=150 -DI2C0_SCLH=150
@@ -468,9 +468,9 @@ test_amc.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_amc.srcs += mcu_periph/uart.c
 test_amc.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_amc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_amc.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_amc.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
-test_amc.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart1
+test_amc.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=UART1
 test_amc.srcs += $(SRC_FIRMWARE)/datalink.c
 
 test_amc.CFLAGS += -DACTUATORS=\"actuators_asctec_twi_blmc_hw.h\"
@@ -513,7 +513,7 @@ test_baro_24.CFLAGS += -DUSE_UART1 -DUART1_BAUD=B57600
 test_baro_24.srcs += mcu_periph/uart.c
 test_baro_24.srcs += $(SRC_ARCH)/mcu_periph/uart_arch.c
 
-test_baro_24.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart1
+test_baro_24.CFLAGS += -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART1
 test_baro_24.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 
 test_baro_24.CFLAGS += -DUSE_I2C1  -DI2C1_SCLL=150 -DI2C1_SCLH=150 -DI2C1_BUF_LEN=16
diff --git a/conf/firmwares/lisa_passthrough.makefile b/conf/firmwares/lisa_passthrough.makefile
index c096ef3dfa..d7f73d72b9 100644
--- a/conf/firmwares/lisa_passthrough.makefile
+++ b/conf/firmwares/lisa_passthrough.makefile
@@ -37,7 +37,7 @@ stm_passthrough.srcs += mcu_periph/sys_time.c $(SRC_ARCH)/mcu_periph/sys_time_ar
 
 # Telemetry
 stm_passthrough.CFLAGS += -DDOWNLINK
-stm_passthrough.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=Uart2
+stm_passthrough.CFLAGS += -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_DEVICE=UART2
 stm_passthrough.srcs += subsystems/datalink/downlink.c subsystems/datalink/pprz_transport.c
 stm_passthrough.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600
 stm_passthrough.srcs += mcu_periph/uart.c
diff --git a/conf/firmwares/subsystems/fixedwing/imu_xsens.makefile b/conf/firmwares/subsystems/fixedwing/imu_xsens.makefile
index 48fb6d7eec..f63b94aad6 100644
--- a/conf/firmwares/subsystems/fixedwing/imu_xsens.makefile
+++ b/conf/firmwares/subsystems/fixedwing/imu_xsens.makefile
@@ -63,6 +63,6 @@ ifndef XSENS_UART_BAUD
 endif
 
 ap.CFLAGS += -DUSE_UART$(XSENS_UART_NR)
-ap.CFLAGS += -DINS_LINK=Uart$(XSENS_UART_NR)
+ap.CFLAGS += -DINS_LINK=UART$(XSENS_UART_NR)
 ap.CFLAGS += -DUART$(XSENS_UART_NR)_BAUD=$(XSENS_UART_BAUD)
 ap.CFLAGS += -DXSENS_OUTPUT_MODE=0x1836
diff --git a/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile b/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
index 9e8ea823ab..6268afc6be 100644
--- a/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
+++ b/conf/firmwares/subsystems/fixedwing/ins_xsens.makefile
@@ -25,7 +25,7 @@ endif
 #B115200
 
 ap.CFLAGS += -DUSE_UART$(XSENS_UART_NR)
-ap.CFLAGS += -DINS_LINK=Uart$(XSENS_UART_NR)
+ap.CFLAGS += -DINS_LINK=UART$(XSENS_UART_NR)
 ap.CFLAGS += -DUART$(XSENS_UART_NR)_BAUD=$(XSENS_UART_BAUD)
 ap.CFLAGS += -DXSENS_OUTPUT_MODE=0x1836
 ap.srcs   += $(SRC_MODULES)/ins/ins_xsens.c
diff --git a/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile b/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
index da9ec6967d..997a642e06 100644
--- a/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
+++ b/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
@@ -7,12 +7,12 @@ ifeq ($(TARGET),fbw)
   ifeq ($(INTERMCU_PORT),none)
     INTERMCU_PORT_NR = 2
   endif
-  fbw.CFLAGS += -DINTERMCU_LINK=Uart$(INTERMCU_PORT_NR) -DUSE_UART$(INTERMCU_PORT_NR) -DUART$(INTERMCU_PORT_NR)_BAUD=B57600
+  fbw.CFLAGS += -DINTERMCU_LINK=UART$(INTERMCU_PORT_NR) -DUSE_UART$(INTERMCU_PORT_NR) -DUART$(INTERMCU_PORT_NR)_BAUD=B57600
 else
   ifeq ($(INTERMCU_PORT),none)
     INTERMCU_PORT_NR = 5
   endif
-  ap.CFLAGS += -DINTERMCU_LINK=Uart$(INTERMCU_PORT_NR) -DUSE_UART$(INTERMCU_PORT_NR) -DUART$(INTERMCU_PORT_NR)_BAUD=B57600
+  ap.CFLAGS += -DINTERMCU_LINK=UART$(INTERMCU_PORT_NR) -DUSE_UART$(INTERMCU_PORT_NR) -DUART$(INTERMCU_PORT_NR)_BAUD=B57600
 endif
 
 ifneq ($(TARGET),sim)
diff --git a/conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile b/conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
index d1d4db32a1..7441f953df 100644
--- a/conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
+++ b/conf/firmwares/subsystems/lisa_passthrough/radio_control_joby.makefile
@@ -8,6 +8,6 @@ stm_passthrough.srcs += $(SRC_SUBSYSTEMS)/radio_control.c \
            $(SRC_BOOZ)/radio_control/booz_radio_control_joby.c
 stm_passthrough.CFLAGS += -DRADIO_CONTROL_LED=6
 stm_passthrough.CFLAGS += -DUSE_UART3 -DUART3_BAUD=B115200
-stm_passthrough.CFLAGS += -DRADIO_CONTROL_LINK=Uart3
+stm_passthrough.CFLAGS += -DRADIO_CONTROL_LINK=UART3
 
 
diff --git a/conf/modules/ahrs_chimu_uart.xml b/conf/modules/ahrs_chimu_uart.xml
index da0fd204b6..b0916a9195 100644
--- a/conf/modules/ahrs_chimu_uart.xml
+++ b/conf/modules/ahrs_chimu_uart.xml
@@ -18,7 +18,7 @@
     <define name="USE_AHRS"/>
     <define name="USE_INS_MODULE"/>
     <define name="USE_UART$(CHIMU_UART_NR)"/>
-    <define name="INS_LINK" value="Uart$(CHIMU_UART_NR)"/>
+    <define name="INS_LINK" value="UART$(CHIMU_UART_NR)"/>
     <define name="UART$(CHIMU_UART_NR)_BAUD" value="B115200"/>
     <file name="ahrs_chimu_uart.c"/>
     <file name="imu_chimu.c"/>
diff --git a/conf/modules/extra_dl.xml b/conf/modules/extra_dl.xml
index 22607b6285..690fb1ff46 100644
--- a/conf/modules/extra_dl.xml
+++ b/conf/modules/extra_dl.xml
@@ -9,8 +9,8 @@
   </header>
   <event fun="ExtraDatalinkEvent()"/>
   <makefile>
-    <define name="EXTRA_DOWNLINK_DEVICE" value="Uart0"/>
-    <define name="EXTRA_PPRZ_UART" value="Uart0"/>
+    <define name="EXTRA_DOWNLINK_DEVICE" value="UART0"/>
+    <define name="EXTRA_PPRZ_UART" value="UART0"/>
     <define name="USE_UART0"/>
     <define name="UART0_BAUD" value="B57600"/>
     <file name="extra_pprz_dl.c"/>
diff --git a/conf/modules/ins_xsens_MTiG_Uart0.xml b/conf/modules/ins_xsens_MTiG_Uart0.xml
index 66ffce03c9..5f0a4d1207 100644
--- a/conf/modules/ins_xsens_MTiG_Uart0.xml
+++ b/conf/modules/ins_xsens_MTiG_Uart0.xml
@@ -13,7 +13,7 @@
   <periodic fun="ins_periodic()" freq="60"/>
   <makefile>
     <define name="USE_UART0"/>
-    <define name="INS_LINK" value="Uart0"/>
+    <define name="INS_LINK" value="UART0"/>
     <define name="UART0_BAUD" value="B115200"/>
     <define name="USE_GPS_XSENS"/>
     <!-- calibrated, orientation, position, velocity, status -->
diff --git a/conf/modules/ins_xsens_MTi_Uart0.xml b/conf/modules/ins_xsens_MTi_Uart0.xml
index 86133ff938..daca33576e 100644
--- a/conf/modules/ins_xsens_MTi_Uart0.xml
+++ b/conf/modules/ins_xsens_MTi_Uart0.xml
@@ -12,7 +12,7 @@
   <periodic fun="ins_periodic()" freq="60"/>
   <makefile>
     <define name="USE_UART0"/>
-    <define name="INS_LINK" value="Uart0"/>
+    <define name="INS_LINK" value="UART0"/>
     <define name="UART0_BAUD" value="B115200"/>
     <!-- calibrated, orientation, status -->
     <define name="XSENS_OUTPUT_MODE" value="0x0806"/>