diff --git a/sw/airborne/firmwares/setup/setup_actuators.c b/sw/airborne/firmwares/setup/setup_actuators.c
index d29970a1f4..eb776b61f3 100644
--- a/sw/airborne/firmwares/setup/setup_actuators.c
+++ b/sw/airborne/firmwares/setup/setup_actuators.c
@@ -23,11 +23,9 @@
  */
 
 #define DATALINK_C
-#define PERIODIC_C_MAIN
 
 #include "generated/airframe.h"
 #include "generated/settings.h"
-#include "generated/periodic_telemetry.h"
 
 #include "subsystems/datalink/datalink.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/modules/digital_cam/uart_cam_ctrl.c b/sw/airborne/modules/digital_cam/uart_cam_ctrl.c
index 88da7a4b64..ea7df75918 100644
--- a/sw/airborne/modules/digital_cam/uart_cam_ctrl.c
+++ b/sw/airborne/modules/digital_cam/uart_cam_ctrl.c
@@ -32,10 +32,8 @@
 #include "modules/digital_cam/dc.h"
 
 // Telemetry
-#include "mcu_periph/uart.h"
-#include "messages.h"
-#include "subsystems/datalink/downlink.h"
-#include "generated/periodic_telemetry.h"
+#include "subsystems/datalink/telemetry.h"
+
 #include BOARD_CONFIG
 
 // Communication
diff --git a/sw/airborne/test/test_actuators_pwm.c b/sw/airborne/test/test_actuators_pwm.c
index 5a963e5c80..920c0d234c 100644
--- a/sw/airborne/test/test_actuators_pwm.c
+++ b/sw/airborne/test/test_actuators_pwm.c
@@ -26,11 +26,9 @@
 
 
 #define DATALINK_C
-#define PERIODIC_C_MAIN
 
 #include "generated/airframe.h"
 #include "generated/settings.h"
-#include "generated/periodic_telemetry.h"
 
 #include "subsystems/datalink/datalink.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/test/test_manual.c b/sw/airborne/test/test_manual.c
index b0220454b2..eaadae8ec8 100644
--- a/sw/airborne/test/test_manual.c
+++ b/sw/airborne/test/test_manual.c
@@ -26,11 +26,9 @@
 
 
 #define DATALINK_C
-#define PERIODIC_C_MAIN
 
 #include "generated/airframe.h"
 #include "generated/settings.h"
-#include "generated/periodic_telemetry.h"
 
 #include "subsystems/datalink/datalink.h"
 #include "subsystems/datalink/downlink.h"
diff --git a/sw/airborne/test/test_telemetry.c b/sw/airborne/test/test_telemetry.c
index 5711c88232..aaca8ddcd1 100644
--- a/sw/airborne/test/test_telemetry.c
+++ b/sw/airborne/test/test_telemetry.c
@@ -19,6 +19,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
+/**
+ * @file test_telemetry.c
+ *
+ * Periodically sends ALIVE telemetry messages.
+ */
+
 #include BOARD_CONFIG
 #include "mcu.h"
 #include "mcu_periph/uart.h"
@@ -27,9 +33,6 @@
 #include "subsystems/datalink/downlink.h"
 #include "led.h"
 
-#define PERIODIC_C_MAIN
-#include "generated/periodic_telemetry.h"
-
 static inline void main_init( void );
 static inline void main_periodic( void );
 
@@ -54,6 +57,3 @@ static inline void main_periodic( void ) {
   RunOnceEvery(10, {DOWNLINK_SEND_ALIVE(DefaultChannel, DefaultDevice, 16, MD5SUM);});
   LED_PERIODIC();
 }
-
-
-
diff --git a/sw/tools/generators/gen_abi.ml b/sw/tools/generators/gen_abi.ml
index 0cf601f2ae..8f4763bfc6 100644
--- a/sw/tools/generators/gen_abi.ml
+++ b/sw/tools/generators/gen_abi.ml
@@ -173,7 +173,7 @@ let () =
     let messages = Syntax.read filename class_name in
 
     (** Print file header *)
-    Printf.fprintf h "/* Automatically generated from %s */\n" filename;
+    Printf.fprintf h "/* Automatically generated by gen_abi from %s */\n" filename;
     Printf.fprintf h "/* Please DO NOT EDIT */\n\n";
     Printf.fprintf h "/* Onboard middleware library ABI\n";
     Printf.fprintf h " * send and receive messages of class %s\n" class_name;
diff --git a/sw/tools/generators/gen_aircraft.ml b/sw/tools/generators/gen_aircraft.ml
index 82e0113d6f..f91c1d7e68 100644
--- a/sw/tools/generators/gen_aircraft.ml
+++ b/sw/tools/generators/gen_aircraft.ml
@@ -274,7 +274,7 @@ let extract_makefile = fun ac_id airframe_file makefile_ac ->
   let xml = Xml.parse_file airframe_file in
   let f = open_out makefile_ac in
 
-  fprintf f "# This file has been generated from %s by %s\n" airframe_file Sys.argv.(0);
+  fprintf f "# This file has been generated by gen_aircraft from %s by %s\n" airframe_file Sys.argv.(0);
   fprintf f "# Please DO NOT EDIT\n";
   fprintf f "AC_ID=%s\n" ac_id;
 
diff --git a/sw/tools/generators/gen_autopilot.ml b/sw/tools/generators/gen_autopilot.ml
index bb1e1547eb..792842253e 100644
--- a/sw/tools/generators/gen_autopilot.ml
+++ b/sw/tools/generators/gen_autopilot.ml
@@ -369,7 +369,7 @@ let parse_and_gen_modes xml_file ap_name main_freq h_dir sm =
 
 (* Output settings xml file *)
 let write_settings = fun xml_file out_set ap ->
-  fprintf out_set "<!-- This file has been generated from %s -->\n" xml_file;
+  fprintf out_set "<!-- This file has been generated by gen_autopilot from %s -->\n" xml_file;
   fprintf out_set "<!-- Please DO NOT EDIT -->\n\n";
   fprintf out_set "<settings>\n";
   fprintf out_set "  <dl_settings>\n";
diff --git a/sw/tools/generators/gen_flight_plan.ml b/sw/tools/generators/gen_flight_plan.ml
index 0b02de8c13..517780c0cb 100644
--- a/sw/tools/generators/gen_flight_plan.ml
+++ b/sw/tools/generators/gen_flight_plan.ml
@@ -779,7 +779,7 @@ let () =
       printf "%s\n" (ExtXml.to_string_fmt dump_xml)
     else begin
       let h_name = "FLIGHT_PLAN_H" in
-      printf "/* This file has been generated from %s */\n" !xml_file;
+      printf "/* This file has been generated by gen_flight_plan from %s */\n" !xml_file;
       printf "/* Please DO NOT EDIT */\n\n";
 
       printf "#ifndef %s\n" h_name;
diff --git a/sw/tools/generators/gen_messages.ml b/sw/tools/generators/gen_messages.ml
index f3438fe682..6fa169a6ec 100644
--- a/sw/tools/generators/gen_messages.ml
+++ b/sw/tools/generators/gen_messages.ml
@@ -359,7 +359,7 @@ let () =
 
     let h = stdout in
 
-    Printf.fprintf h "/* Automatically generated from %s */\n" filename;
+    Printf.fprintf h "/* Automatically generated by gen_messages from %s */\n" filename;
     Printf.fprintf h "/* Please DO NOT EDIT */\n";
 
     Printf.fprintf h "/* Macros to send and receive messages of class %s */\n" class_name;
diff --git a/sw/tools/generators/gen_messages2.ml b/sw/tools/generators/gen_messages2.ml
index 5c23c6d9ff..aaa40ab6ed 100644
--- a/sw/tools/generators/gen_messages2.ml
+++ b/sw/tools/generators/gen_messages2.ml
@@ -311,7 +311,7 @@ let () =
 
     let h = stdout in
 
-    Printf.fprintf h "/* Automatically generated from %s */\n" filename;
+    Printf.fprintf h "/* Automatically generated by gen_messages2 from %s */\n" filename;
     Printf.fprintf h "/* Please DO NOT EDIT */\n";
 
     Printf.fprintf h "/* Macros to send and receive messages of class %s */\n" class_name;
diff --git a/sw/tools/generators/gen_modules.ml b/sw/tools/generators/gen_modules.ml
index 7a32fcfe1c..801dcb3204 100644
--- a/sw/tools/generators/gen_modules.ml
+++ b/sw/tools/generators/gen_modules.ml
@@ -316,7 +316,7 @@ let check_dependencies = fun modules names ->
   ) modules
 
 let write_settings = fun xml_file out_set modules ->
-  fprintf out_set "<!-- This file has been generated from %s -->\n" xml_file;
+  fprintf out_set "<!-- This file has been generated by gen_modules from %s -->\n" xml_file;
   fprintf out_set "<!-- Please DO NOT EDIT -->\n\n";
   fprintf out_set "<settings>\n";
   fprintf out_set " <dl_settings>\n";
diff --git a/sw/tools/generators/gen_mtk.ml b/sw/tools/generators/gen_mtk.ml
index 2fb96de0ad..fd0885fa72 100644
--- a/sw/tools/generators/gen_mtk.ml
+++ b/sw/tools/generators/gen_mtk.ml
@@ -151,7 +151,7 @@ let _ =
   let xml_file = Sys.argv.(1) in
   try
     let xml = Xml.parse_file xml_file in
-    fprintf out "/* Generated from %s */\n" xml_file;
+    fprintf out "/* Generated by gen_mtk from %s */\n" xml_file;
     fprintf out "/* Please DO NOT EDIT */\n\n";
 
     define "MTK_DIY14_SYNC1" "0xB5";
diff --git a/sw/tools/generators/gen_periodic.ml b/sw/tools/generators/gen_periodic.ml
index 365575c06d..fbd7937d69 100644
--- a/sw/tools/generators/gen_periodic.ml
+++ b/sw/tools/generators/gen_periodic.ml
@@ -100,7 +100,7 @@ let output_modes = fun out_h process_name modes freq modules ->
 let write_settings = fun xml_file out_set telemetry_xml ->
   (* filter xml file to remove unneeded process and modes (more than 1 mode per process) *)
   let filtered_xml = List.filter (fun p -> List.length (Xml.children p) > 1) (Xml.children telemetry_xml) in
-  fprintf out_set "<!-- This file has been generated from %s -->\n" xml_file;
+  fprintf out_set "<!-- This file has been generated by gen_periodic from %s -->\n" xml_file;
   fprintf out_set "<!-- Please DO NOT EDIT -->\n\n";
   fprintf out_set "<settings>\n";
   if List.length filtered_xml > 0 then begin
@@ -115,7 +115,7 @@ let write_settings = fun xml_file out_set telemetry_xml ->
       match nb_modes with
       | 0 | 1 -> () (* Nothing to do if 1 or zero mode *)
       | _ -> (* add settings with all modes *)
-          fprintf out_set "   <dl_setting min=\"0\" step=\"1\" max=\"%d\" var=\"telemetry_mode_%s\" shortname=\"%s\" values=\"%s\">\n" (nb_modes-1) process_name process_name (String.concat "|" modes);
+          fprintf out_set "   <dl_setting min=\"0\" step=\"1\" max=\"%d\" var=\"telemetry_mode_%s\" shortname=\"%s\" values=\"%s\" module=\"generated/periodic_telemetry\">\n" (nb_modes-1) process_name process_name (String.concat "|" modes);
           let i = ref 0 in
           List.iter (fun m -> try
             let key = Xml.attrib m "key_press" in
@@ -146,7 +146,7 @@ let _ =
 
   let out_h = stdout in
 
-  fprintf out_h "/* This file has been generated from %s and %s */\n" Sys.argv.(2) Sys.argv.(3);
+  fprintf out_h "/* This file has been generated by gen_periodic from %s and %s */\n" Sys.argv.(2) Sys.argv.(3);
   fprintf out_h "/* Please DO NOT EDIT */\n\n";
   fprintf out_h "#ifndef _VAR_PERIODIC_H_\n";
   fprintf out_h "#define _VAR_PERIODIC_H_\n\n";
diff --git a/sw/tools/generators/gen_radio.ml b/sw/tools/generators/gen_radio.ml
index 3ae0f28886..99afacfbc9 100644
--- a/sw/tools/generators/gen_radio.ml
+++ b/sw/tools/generators/gen_radio.ml
@@ -138,7 +138,7 @@ let _ =
   let xml_file = Sys.argv.(1) in
   let xml = Xml.parse_file xml_file in
 
-  printf "/* This file has been generated from %s */\n" xml_file;
+  printf "/* This file has been generated by gen_radio from %s */\n" xml_file;
   printf "/* Please DO NOT EDIT */\n\n";
   printf "#ifndef %s\n" h_name;
   define h_name "";
diff --git a/sw/tools/generators/gen_settings.ml b/sw/tools/generators/gen_settings.ml
index 56afd9a863..de7f8b458b 100644
--- a/sw/tools/generators/gen_settings.ml
+++ b/sw/tools/generators/gen_settings.ml
@@ -65,7 +65,6 @@ let print_dl_settings = fun settings ->
   lprintf "\n";
   StringSet.iter (fun m -> lprintf "#include \"%s.h\"\n" m) !modules;
   lprintf "#include \"generated/modules.h\"\n";
-  lprintf "#include \"generated/periodic_telemetry.h\"\n";
   lprintf "\n";
 
   (** Datalink knowing what settings mean **)
@@ -326,7 +325,7 @@ let _ =
   done;
 
   try
-    printf "/* This file has been generated from %s */\n" (String.concat " " !xml_files);
+    printf "/* This file has been generated by gen_settings from %s */\n" (String.concat " " !xml_files);
     printf "/* Please DO NOT EDIT */\n\n";
 
     printf "#ifndef %s\n" h_name;
diff --git a/sw/tools/generators/gen_ubx.ml b/sw/tools/generators/gen_ubx.ml
index 3501648b33..ceda079914 100644
--- a/sw/tools/generators/gen_ubx.ml
+++ b/sw/tools/generators/gen_ubx.ml
@@ -153,7 +153,7 @@ let _ =
   let xml_file = Sys.argv.(1) in
   try
     let xml = Xml.parse_file xml_file in
-    fprintf out "/* Generated from %s */\n" xml_file;
+    fprintf out "/* Generated by gen_ubx from %s */\n" xml_file;
     fprintf out "/* Please DO NOT EDIT */\n\n";
 
     define "UBX_SYNC1" "0xB5";
diff --git a/sw/tools/generators/gen_xsens.ml b/sw/tools/generators/gen_xsens.ml
index af5b665f1c..fbaad0514d 100644
--- a/sw/tools/generators/gen_xsens.ml
+++ b/sw/tools/generators/gen_xsens.ml
@@ -225,7 +225,7 @@ let _ =
   let xml_file = Sys.argv.(1) in
   try
     let xml = Xml.parse_file xml_file in
-    fprintf out "/* Generated from %s */\n" xml_file;
+    fprintf out "/* Generated by gen_xsens from %s */\n" xml_file;
     fprintf out "/* Please DO NOT EDIT */\n\n";
 
     define "XSENS_START" "0xFA";