diff --git a/conf/airframes/CDW/asctec_cdw.xml b/conf/airframes/CDW/asctec_cdw.xml
index 88fca02047..1cf96bc7ed 100644
--- a/conf/airframes/CDW/asctec_cdw.xml
+++ b/conf/airframes/CDW/asctec_cdw.xml
@@ -41,7 +41,7 @@
   <!-- ************************* MODULES ************************* -->
 
   <modules main_freq="512">
-    <!--   <load name="high_speed_logger_spi_link.xml"/> -->
+    <!--   <load name="logger_spi_link.xml"/> -->
     <load name="imu_quality_assessment.xml"/>
     <load name="gps_ubx_ucenter.xml" />
   </modules>
diff --git a/conf/airframes/ardrone2_opticflow_hover.xml b/conf/airframes/ardrone2_opticflow_hover.xml
index fa1f9810e0..d5e98c8e68 100644
--- a/conf/airframes/ardrone2_opticflow_hover.xml
+++ b/conf/airframes/ardrone2_opticflow_hover.xml
@@ -28,7 +28,7 @@
   <modules main_freq="512">
     <load name="gps_ubx_ucenter.xml"/>
     <load name="send_imu_mag_current.xml"/>
-    <load name="file_logger.xml"/>
+    <load name="logger_file.xml"/>
     <load name="cv_opticflow.xml"/>
   </modules>
 
diff --git a/conf/airframes/ardrone2_raw.xml b/conf/airframes/ardrone2_raw.xml
index a59efa45a8..4e1cf2d4d8 100644
--- a/conf/airframes/ardrone2_raw.xml
+++ b/conf/airframes/ardrone2_raw.xml
@@ -28,8 +28,8 @@
   <modules main_freq="512">
     <load name="gps_ubx_ucenter.xml"/>
     <load name="send_imu_mag_current.xml"/>
-    <load name="file_logger.xml"/>
-    <!--  load name="../../sw/ext/ardrone2_vision/modules/Mjpeg/ViewVideo.xml"/-->
+    <load name="logger_file.xml"/>
+    <!--  load name="video_rtp_stream.xml"/-->
   </modules>
 
   <commands>
diff --git a/conf/airframes/bebop.xml b/conf/airframes/bebop.xml
index 9d16431af6..74300f6859 100644
--- a/conf/airframes/bebop.xml
+++ b/conf/airframes/bebop.xml
@@ -27,7 +27,7 @@
 
   <modules main_freq="512">
     <load name="send_imu_mag_current.xml"/>
-    <load name="file_logger.xml">
+    <load name="logger_file.xml">
       <define name="FILE_LOGGER_PATH" value="\\\"/data/ftp/internal_000/\\\""/>
     </load>
   </modules>
diff --git a/conf/airframes/examples/microjet.xml b/conf/airframes/examples/microjet.xml
index 0029ca80f9..0c6549b76f 100644
--- a/conf/airframes/examples/microjet.xml
+++ b/conf/airframes/examples/microjet.xml
@@ -193,7 +193,7 @@
   </section>
 
   <modules>
-    <load name="openlog.xml"/>
+    <load name="logger_telemetry.xml"/>
     <load name="nav_survey_polygon.xml"/>
     <load name="nav_line_border.xml"/>
     <load name="nav_line.xml"/>
diff --git a/conf/airframes/examples/quadrotor_navstik.xml b/conf/airframes/examples/quadrotor_navstik.xml
index 206fe52ef7..359f261e7b 100644
--- a/conf/airframes/examples/quadrotor_navstik.xml
+++ b/conf/airframes/examples/quadrotor_navstik.xml
@@ -48,7 +48,7 @@
       <define name="MS45XX_I2C_DEV" value="i2c3"/>
       <define name="USE_I2C3"/>
     </load>
-    <load name="direct_memory_logger.xml"/>
+    <load name="logger_dataflash.xml"/>
   </modules>
 
   <servos driver="Asctec_v2">
diff --git a/conf/modules/logger_dataflash.xml b/conf/modules/logger_dataflash.xml
index 6cc431e689..453394d7a2 100644
--- a/conf/modules/logger_dataflash.xml
+++ b/conf/modules/logger_dataflash.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="loggers">
+<module name="logger_dataflash" dir="loggers">
   <doc>
     <description>
 SPI logger
diff --git a/conf/modules/logger_file.xml b/conf/modules/logger_file.xml
index 938b463851..52c4f3ba09 100644
--- a/conf/modules/logger_file.xml
+++ b/conf/modules/logger_file.xml
@@ -1,14 +1,15 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="loggers">
-  <doc>
-    <description>Logs to a csv file (only for linux)</description>
-  </doc>
-  <header>
-    <file name="file_logger.h"/>
-  </header>
-  <periodic fun="file_logger_periodic()" start="file_logger_start()" stop="file_logger_stop()" autorun="FALSE"/>
-  <makefile>
-    <file name="file_logger.c"/>
-  </makefile>
+<module name="logger_file" dir="loggers">
+	<doc>
+		<description>Logs to a csv file (only for linux)</description>
+	</doc>
+	<header>
+		<file name="file_logger.h" />
+	</header>
+	<periodic fun="file_logger_periodic()" start="file_logger_start()"
+		stop="file_logger_stop()" autorun="FALSE" />
+	<makefile>
+		<file name="file_logger.c" />
+	</makefile>
 </module>
diff --git a/conf/modules/logger_spi_link.xml b/conf/modules/logger_spi_link.xml
index 68ff4b5b29..876e0c3d53 100644
--- a/conf/modules/logger_spi_link.xml
+++ b/conf/modules/logger_spi_link.xml
@@ -1,8 +1,8 @@
 <!DOCTYPE module SYSTEM "module.dtd">
 
-<module name="loggers">
+<module name="logger_spi_link" dir="loggers">
   <doc>
-    <description>Connect to external High-Speed SD-logger via SPI</description>
+    <description>Stream all IMU data to external High-Speed SD-logger via SPI</description>
   </doc>
   <header>
     <file name="high_speed_logger_spi_link.h"/>
diff --git a/conf/modules/logger_telemetry.xml b/conf/modules/logger_telemetry.xml
new file mode 100644
index 0000000000..3f0bfd8295
--- /dev/null
+++ b/conf/modules/logger_telemetry.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE module SYSTEM "module.dtd">
+
+<module name="logger_telemetry" dir="loggers">
+  <doc>
+    <description>Logging Timestamp in telemetry.
+
+        e.g. use Openlog on-board data logger to log telemetry stream.
+        sw/logalizer/openlog2tlm to convert a recorded dumpfile,
+        created by openlog into the pprz-tlm format, to be converted into
+        .data and .log files by sw/logalizer/sd2log
+    </description>
+  </doc>
+  <header>
+    <file name="openlog.h"/>
+  </header>
+  <init fun="init_openlog()"/>
+  <periodic fun="periodic_2Hz_openlog()" freq="2." autorun="TRUE"/>
+  <makefile>
+    <file name="openlog.c"/>
+  </makefile>
+</module>
+
diff --git a/conf/modules/logger_uart.xml b/conf/modules/logger_uart.xml
index 7242d59573..405aa4ae72 100644
--- a/conf/modules/logger_uart.xml
+++ b/conf/modules/logger_uart.xml
@@ -2,8 +2,9 @@
 
 <module name="logger_uart" dir="loggers">
   <doc>
-    <description>Logs to serial</description>
-  </doc>
+    <description>Stream IMU raw data over UART for off-board logging.</description>
+    <configure name="LOGGER_PORT" value="UART1|UART2|UART3|UART4|UART5|UART6" description="Port to stream the realtime log"/>
+    </doc>
   <header>
     <file name="logger_uart.h"/>
   </header>
diff --git a/conf/modules/openlog.xml b/conf/modules/openlog.xml
deleted file mode 100644
index 194d9a48c1..0000000000
--- a/conf/modules/openlog.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<!DOCTYPE module SYSTEM "module.dtd">
-
-<module name="openlog">
-  <doc>
-    <description>Openlog on-board data logger</description>
-  </doc>
-  <header>
-    <file name="openlog.h"/>
-  </header>
-  <init fun="init_openlog()"/>
-  <periodic fun="periodic_2Hz_openlog()" freq="2." autorun="TRUE"/>
-  <makefile>
-    <file name="openlog.c"/>
-  </makefile>
-</module>
-