diff --git a/sw/airborne/arch/lpc21/usb_tunnel.c b/sw/airborne/arch/lpc21/usb_tunnel.c
index aeef32b1dc..c2acef1e61 100644
--- a/sw/airborne/arch/lpc21/usb_tunnel.c
+++ b/sw/airborne/arch/lpc21/usb_tunnel.c
@@ -71,7 +71,7 @@ int main( void ) {
       LED_ON(2);
       tx_time = T0TC;
       inc = VCOM_getchar();
-      uart0_transmit(inc);
+      Uart0Transmit(inc);
     }
   }
 #else
@@ -88,7 +88,7 @@ int main( void ) {
       LED_ON(2);
       tx_time = T0TC;
       inc = VCOM_getchar();
-      uart1_transmit(inc);
+      Uart1Transmit(inc);
     }
   }
 #endif
diff --git a/sw/airborne/booz/test/booz2_tunnel.c b/sw/airborne/booz/test/booz2_tunnel.c
index 9f8a4689ea..6bf2379e9d 100644
--- a/sw/airborne/booz/test/booz2_tunnel.c
+++ b/sw/airborne/booz/test/booz2_tunnel.c
@@ -62,10 +62,10 @@ static inline void main_periodic_task( void ) {
 static inline void main_event_task( void ) {
 
   while (Uart1ChAvailable())
-    uart0_transmit(Uart1Getch());
+    Uart0Transmit(Uart1Getch());
 
   while (Uart0ChAvailable())
-    uart1_transmit(Uart0Getch());
+    Uart1Transmit(Uart0Getch());
 
 
 }
diff --git a/sw/airborne/csc/ppm_bridge_main.c b/sw/airborne/csc/ppm_bridge_main.c
index e2915321b7..95961e9ef8 100644
--- a/sw/airborne/csc/ppm_bridge_main.c
+++ b/sw/airborne/csc/ppm_bridge_main.c
@@ -81,8 +81,8 @@ static void csc_main_periodic( void )
 
 static void send_short( int16_t s )
 {
-  uart1_transmit(s >> 8);
-  uart1_transmit(s & 0xFF);
+  Uart1Transmit(s >> 8);
+  Uart1Transmit(s & 0xFF);
 }
 
 static void send_channel ( int16_t c )
diff --git a/sw/airborne/firmwares/vor/lpc_vor_main.c b/sw/airborne/firmwares/vor/lpc_vor_main.c
index bb6ee1e1b4..818f23e394 100644
--- a/sw/airborne/firmwares/vor/lpc_vor_main.c
+++ b/sw/airborne/firmwares/vor/lpc_vor_main.c
@@ -50,31 +50,31 @@ static inline void main_report( void ) {
     my_qdr = vid_qdr * 360 / 4980;
     if (my_qdr < 0) my_qdr+=3600;
     if (my_qdr > 3600) my_qdr-=3600;
-    uart0_transmit('\r');
+    Uart0Transmit('\r');
     break;
   case 1:
     tmp = my_qdr / 1000;
     my_qdr = my_qdr - 1000*tmp;
-    uart0_transmit('0'+tmp);
+    Uart0Transmit('0'+tmp);
     break;
   case 2:
     tmp = my_qdr / 100;
     my_qdr = my_qdr - 100*tmp;
-    uart0_transmit('0'+tmp);
+    Uart0Transmit('0'+tmp);
     break;
   case 3:
     tmp = my_qdr / 10;
     my_qdr = my_qdr - 10*tmp;
-    uart0_transmit('0'+tmp);
+    Uart0Transmit('0'+tmp);
     break;
   case 4:
-    uart0_transmit('.');
+    Uart0Transmit('.');
     break;
   case 5:
-    uart0_transmit('0'+my_qdr);
+    Uart0Transmit('0'+my_qdr);
     break;
   case 6:
-    uart0_transmit('\r');
+    Uart0Transmit('\r');
     break;
   }
 
diff --git a/sw/airborne/lisa/test/lisa_tunnel.c b/sw/airborne/lisa/test/lisa_tunnel.c
index 48c5072eca..d50839ffa0 100644
--- a/sw/airborne/lisa/test/lisa_tunnel.c
+++ b/sw/airborne/lisa/test/lisa_tunnel.c
@@ -59,10 +59,10 @@ static inline void main_periodic_task( void ) {
 static inline void main_event_task( void ) {
 
   if (Uart2ChAvailable())
-    uart1_transmit(Uart2Getch());
+    Uart1Transmit(Uart2Getch());
 
   if (Uart1ChAvailable())
-    uart2_transmit(Uart1Getch());
+    Uart2Transmit(Uart1Getch());
 
 
 }
diff --git a/sw/airborne/lisa/test/test_board.c b/sw/airborne/lisa/test/test_board.c
index 603f6ec155..d1fab3a701 100644
--- a/sw/airborne/lisa/test/test_board.c
+++ b/sw/airborne/lisa/test/test_board.c
@@ -246,8 +246,8 @@ static void test_uart_periodic(void) {
 
   if (idx_tx<sizeof(buf_src)) {
     switch (direction) {
-    case OneToThree : uart1_transmit(buf_src[idx_tx]); break;
-    case ThreeToOne : uart3_transmit(buf_src[idx_tx]); break;
+    case OneToThree : Uart1Transmit(buf_src[idx_tx]); break;
+    case ThreeToOne : Uart3Transmit(buf_src[idx_tx]); break;
     default: break;
     }
     idx_tx++;
diff --git a/sw/airborne/obsolete/3dmg.c b/sw/airborne/obsolete/3dmg.c
index 589dcc14e8..32fa008c47 100644
--- a/sw/airborne/obsolete/3dmg.c
+++ b/sw/airborne/obsolete/3dmg.c
@@ -40,7 +40,7 @@ void _3dmg_set_continuous_mode ( void ) {
   uint8_t msg[REQ_CONT_LEN] = { 0x10, 0x00, 0x31, 0x00, 0x41};
   uint8_t i;
   for (i=0; i<REQ_CONT_LEN; i++)
-    uart0_transmit(msg[i]);
+    Uart0Transmit(msg[i]);
 }
 
 void _3dmg_capture_neutral ( void ) {
@@ -48,7 +48,7 @@ void _3dmg_capture_neutral ( void ) {
   uint8_t msg[REQ_CONT_LEN] = { 0x06, 0x00, 0x06};
   uint8_t i;
   for (i=0; i<CAP_GYR_LEN; i++)
-    uart0_transmit(msg[i]);
+    Uart0Transmit(msg[i]);
 }
 
 
diff --git a/sw/airborne/print.h b/sw/airborne/print.h
index c62bee3872..f2e9b5f9f1 100644
--- a/sw/airborne/print.h
+++ b/sw/airborne/print.h
@@ -61,10 +61,10 @@
 
 #ifdef USE_UART0
 
-#define Uart0PrintHex(c) _PrintHex(uart0_transmit, c)
-#define Uart0PrintHex16(c) _PrintHex16(uart0_transmit, c)
-#define Uart0PrintHex32(c) _PrintHex32(uart0_transmit, c)
-#define Uart0PrintString(s) _PrintString(uart0_transmit, s)
+#define Uart0PrintHex(c) _PrintHex(Uart0Transmit, c)
+#define Uart0PrintHex16(c) _PrintHex16(Uart0Transmit, c)
+#define Uart0PrintHex32(c) _PrintHex32(Uart0Transmit, c)
+#define Uart0PrintString(s) _PrintString(Uart0Transmit, s)
 
 #define UART0PrintHex     Uart0PrintHex
 #define UART0PrintHex16   Uart0PrintHex16
@@ -75,10 +75,10 @@
 
 #ifdef USE_UART1
 
-#define Uart1PrintHex(c) _PrintHex(uart1_transmit, c)
-#define Uart1PrintHex16(c) _PrintHex16(uart1_transmit, c)
-#define Uart1PrintHex32(c) _PrintHex32(uart1_transmit, c)
-#define Uart1PrintString(s) _PrintString(uart1_transmit, s)
+#define Uart1PrintHex(c) _PrintHex(Uart1Transmit, c)
+#define Uart1PrintHex16(c) _PrintHex16(Uart1Transmit, c)
+#define Uart1PrintHex32(c) _PrintHex32(Uart1Transmit, c)
+#define Uart1PrintString(s) _PrintString(Uart1Transmit, s)
 
 #define UART1PrintHex     Uart1PrintHex
 #define UART1PrintHex16   Uart1PrintHex16
@@ -89,10 +89,10 @@
 
 #ifdef USE_UART2
 
-#define Uart2PrintHex(c) _PrintHex(uart2_transmit, c)
-#define Uart2PrintHex16(c) _PrintHex16(uart2_transmit, c)
-#define Uart2PrintHex32(c) _PrintHex32(uart2_transmit, c)
-#define Uart2PrintString(s) _PrintString(uart2_transmit, s)
+#define Uart2PrintHex(c) _PrintHex(Uart2Transmit, c)
+#define Uart2PrintHex16(c) _PrintHex16(Uart2Transmit, c)
+#define Uart2PrintHex32(c) _PrintHex32(Uart2Transmit, c)
+#define Uart2PrintString(s) _PrintString(Uart2Transmit, s)
 
 #define UART2PrintHex     Uart2PrintHex
 #define UART2PrintHex16   Uart2PrintHex16
@@ -103,10 +103,10 @@
 
 #ifdef USE_UART3
 
-#define Uart3PrintHex(c) _PrintHex(uart3_transmit, c)
-#define Uart3PrintHex16(c) _PrintHex16(uart3_transmit, c)
-#define Uart3PrintHex32(c) _PrintHex32(uart3_transmit, c)
-#define Uart3PrintString(s) _PrintString(uart3_transmit, s)
+#define Uart3PrintHex(c) _PrintHex(Uart3Transmit, c)
+#define Uart3PrintHex16(c) _PrintHex16(Uart3Transmit, c)
+#define Uart3PrintHex32(c) _PrintHex32(Uart3Transmit, c)
+#define Uart3PrintString(s) _PrintString(Uart3Transmit, s)
 
 #define UART3PrintHex     Uart3PrintHex
 #define UART3PrintHex16   Uart3PrintHex16
@@ -117,10 +117,10 @@
 
 #ifdef USE_UART5
 
-#define Uart5PrintHex(c) _PrintHex(uart5_transmit, c)
-#define Uart5PrintHex16(c) _PrintHex16(uart5_transmit, c)
-#define Uart5PrintHex32(c) _PrintHex32(uart5_transmit, c)
-#define Uart5PrintString(s) _PrintString(uart5_transmit, s)
+#define Uart5PrintHex(c) _PrintHex(Uart5Transmit, c)
+#define Uart5PrintHex16(c) _PrintHex16(Uart5Transmit, c)
+#define Uart5PrintHex32(c) _PrintHex32(Uart5Transmit, c)
+#define Uart5PrintString(s) _PrintString(Uart5Transmit, s)
 
 #define UART5PrintHex     Uart5PrintHex
 #define UART5PrintHex16   Uart5PrintHex16