diff --git a/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h b/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
index 32be3926d0..aef16b26d7 100644
--- a/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
+++ b/sw/airborne/arch/lpc21/subsystems/radio_control/spektrum_arch.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H
-#define BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H
+#ifndef RADIO_CONTROL_SPEKTRUM_ARCH_H
+#define RADIO_CONTROL_SPEKTRUM_ARCH_H
 
 #include "std.h"
 #include "uart.h"
@@ -99,4 +99,4 @@ extern const int16_t rc_spk_throw[RADIO_CONTROL_NB_CHANNEL];
   }
 
 
-#endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H */
+#endif /* RADIO_CONTROL_SPEKTRUM_ARCH_H */
diff --git a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
index d2c1055fdb..2bd6d60f8c 100644
--- a/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
+++ b/sw/airborne/arch/stm32/subsystems/radio_control/spektrum_arch.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H
-#define BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H
+#ifndef RADIO_CONTROL_SPEKTRUM_ARCH_H
+#define RADIO_CONTROL_SPEKTRUM_ARCH_H
 
 
 /*
@@ -65,4 +65,4 @@
 
 extern void RadioControlEventImp(void (*_received_frame_handler)(void));
 
-#endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_ARCH_H */
+#endif /* RADIO_CONTROL_SPEKTRUM_ARCH_H */
diff --git a/sw/airborne/subsystems/radio_control/radio_control_dummy.h b/sw/airborne/subsystems/radio_control/radio_control_dummy.h
index 8b1b9f2ff4..b976b09684 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_dummy.h
+++ b/sw/airborne/subsystems/radio_control/radio_control_dummy.h
@@ -22,11 +22,11 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef BOOZ_RADIO_CONTROL_NULL_H
-#define BOOZ_RADIO_CONTROL_NULL_H
+#ifndef RADIO_CONTROL_NULL_H
+#define RADIO_CONTROL_NULL_H
 
-#include "conf_radio_control_ppm.h"
+#include "radio.h"
 
 #define RadioControlEvent(_received_frame_handler) { }
 
-#endif /* BOOZ_RADIO_CONTROL_NULL_H */
+#endif /* RADIO_CONTROL_NULL_H */
diff --git a/sw/airborne/subsystems/radio_control/radio_control_joby.h b/sw/airborne/subsystems/radio_control/radio_control_joby.h
index 1e73560943..b7640e7991 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_joby.h
+++ b/sw/airborne/subsystems/radio_control/radio_control_joby.h
@@ -22,8 +22,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef BOOZ_RADIO_CONTROL_JOBY_H
-#define BOOZ_RADIO_CONTROL_JOBY_H
+#ifndef RADIO_CONTROL_JOBY_H
+#define RADIO_CONTROL_JOBY_H
 
 #include "std.h"
 #include "uart.h"
@@ -72,4 +72,4 @@ void rc_joby_parse(int8_t c, void (* callback)(void));
   }
 
 
-#endif /* BOOZ_RADIO_CONTROL_JOBY_H */
+#endif /* RADIO_CONTROL_JOBY_H */
diff --git a/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h b/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h
index 1dc080b594..c601e078cd 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h
+++ b/sw/airborne/subsystems/radio_control/radio_control_joby_9ch.h
@@ -21,8 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef BOOZ_RADIO_CONTROL_JOBY_9CH_H
-#define BOOZ_RADIO_CONTROL_JOBY_9CH_H
+#ifndef RADIO_CONTROL_JOBY_9CH_H
+#define RADIO_CONTROL_JOBY_9CH_H
 
 #define RADIO_CONTROL_NB_CHANNEL 9
 
@@ -48,4 +48,4 @@
                         1, \
                         1 }
 
-#endif /* BOOZ_RADIO_CONTROL_JOBY_9CH_H */
+#endif /* RADIO_CONTROL_JOBY_9CH_H */
diff --git a/sw/airborne/subsystems/radio_control/radio_control_spektrum.c b/sw/airborne/subsystems/radio_control/radio_control_spektrum.c
index 48224c5b1e..fc7becb8cc 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_spektrum.c
+++ b/sw/airborne/subsystems/radio_control/radio_control_spektrum.c
@@ -21,7 +21,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include "booz_radio_control_spektrum.h"
+#include "spektrum.h"
 
 /* Currently the functionality has been pushed into the arch directories
  * both arch directories contain essentially the original parser.
diff --git a/sw/airborne/subsystems/radio_control/radio_control_spektrum.h b/sw/airborne/subsystems/radio_control/radio_control_spektrum.h
index e4fc7389f5..ec724b74f4 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_spektrum.h
+++ b/sw/airborne/subsystems/radio_control/radio_control_spektrum.h
@@ -22,15 +22,15 @@
  *
  */
 
-#ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_H
-#define BOOZ_RADIO_CONTROL_SPEKTRUM_H
+#ifndef RADIO_CONTROL_SPEKTRUM_H
+#define RADIO_CONTROL_SPEKTRUM_H
 
-/* implemented in booz/arch/xxx/radio_control/booz_radio_control_spektrum_arch.c */
+/* implemented in arch/xxx/subsystems/radio_control/spektrum_arch.c */
 extern void radio_control_spektrum_try_bind(void);
 
-#include "radio_control/booz_radio_control_spektrum_arch.h"
-/* implemented in booz/arch/xxx/radio_control/booz_radio_control_spektrum_arch.c */
+#include <subsystems/radio_control/spektrum_arch.h>
+/* implemented in arch/xxx/subsystems/radio_control/spektrum_arch.c */
 
 #define RadioControlEvent(_received_frame_handler) RadioControlEventImp(_received_frame_handler)
 
-#endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_H */
+#endif /* RADIO_CONTROL_SPEKTRUM_H */
diff --git a/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h b/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
index 66d177f50f..c4a84e5d38 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
+++ b/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se.h
@@ -21,8 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H
-#define BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H
+#ifndef RADIO_CONTROL_SPEKTRUM_DX7SE_H
+#define RADIO_CONTROL_SPEKTRUM_DX7SE_H
 
 #define RADIO_CONTROL_NB_CHANNEL 7
 #define RADIO_CONTROL_ROLL       0
@@ -51,4 +51,4 @@
   throttle 5
 */
 
-#endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H */
+#endif /* RADIO_CONTROL_SPEKTRUM_DX7SE_H */
diff --git a/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h b/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h
index 237028c895..4a0fd75fdf 100644
--- a/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h
+++ b/sw/airborne/subsystems/radio_control/radio_control_spektrum_dx7se_joby.h
@@ -21,8 +21,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H
-#define BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H
+#ifndef RADIO_CONTROL_SPEKTRUM_DX7SE_H
+#define RADIO_CONTROL_SPEKTRUM_DX7SE_H
 
 #define RADIO_CONTROL_NB_CHANNEL 7
 
@@ -51,4 +51,4 @@
   throttle 5
 */
 
-#endif /* BOOZ_RADIO_CONTROL_SPEKTRUM_DX7SE_H */
+#endif /* RADIO_CONTROL_SPEKTRUM_DX7SE_H */