diff --git a/conf/telemetry/default_rotorcraft_mavlink.xml b/conf/telemetry/default_rotorcraft_mavlink.xml
new file mode 100644
index 00000000000..0e06bfd170c
--- /dev/null
+++ b/conf/telemetry/default_rotorcraft_mavlink.xml
@@ -0,0 +1,158 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/conf/telemetry/fixedwing_flight_recorder.xml b/conf/telemetry/fixedwing_flight_recorder.xml
index c833ac2bef8..8ce7fdb4cd4 100644
--- a/conf/telemetry/fixedwing_flight_recorder.xml
+++ b/conf/telemetry/fixedwing_flight_recorder.xml
@@ -131,7 +131,7 @@
-
+
diff --git a/conf/telemetry/hitl_fixedwing.xml b/conf/telemetry/hitl_fixedwing.xml
deleted file mode 100644
index 93a8be09ed5..00000000000
--- a/conf/telemetry/hitl_fixedwing.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/conf/telemetry/telemetry_test_passthrough.xml b/conf/telemetry/telemetry_test_passthrough.xml
deleted file mode 100644
index cae43185221..00000000000
--- a/conf/telemetry/telemetry_test_passthrough.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/sw/airborne/boards/bebop/actuators.c b/sw/airborne/boards/bebop/actuators.c
index 547152e2ae9..f3faaa60c24 100644
--- a/sw/airborne/boards/bebop/actuators.c
+++ b/sw/airborne/boards/bebop/actuators.c
@@ -66,7 +66,7 @@ void actuators_bebop_init(void)
actuators_bebop.led = 0;
#if PERIODIC_TELEMETRY
- register_periodic_telemetry(DefaultPeriodic, PPRZ_MSG_ID_BEBOP_ACTUATORS, send_actuators_bebop);
+ register_periodic_telemetry(DefaultPeriodic, PPRZ_MSG_ID_BEBOP_ACTUATORS, send_bebop_actuators);
#endif
}