diff --git a/sw/ground_segment/tmtc/ivy2serial.ml b/sw/ground_segment/tmtc/ivy2serial.ml
index 46d46f3983..03ead4c653 100644
--- a/sw/ground_segment/tmtc/ivy2serial.ml
+++ b/sw/ground_segment/tmtc/ivy2serial.ml
@@ -93,7 +93,7 @@ let () =
         let use_dl_message = fun payload ->
           Debug.trace 'x' (Debug.xprint (Protocol.string_of_payload payload));
           let (header, values) = Dl_Pprz.values_of_payload payload in
-          let msg = Dl_Pprz.message_of_id header.message_id in
+          let msg = Dl_Pprz.message_of_id header.PprzLink.message_id in
           Dl_Pprz.message_send "ground_dl" msg.PprzLink.name values in
 
         assert (PprzTransport.parse use_dl_message (Bytes.to_string b) = n)
diff --git a/sw/ground_segment/tmtc/ivy2udp.ml b/sw/ground_segment/tmtc/ivy2udp.ml
index 556f2f3ae6..67e7a0e045 100644
--- a/sw/ground_segment/tmtc/ivy2udp.ml
+++ b/sw/ground_segment/tmtc/ivy2udp.ml
@@ -87,7 +87,7 @@ let () =
         let use_dl_message = fun payload ->
           Debug.trace 'x' (Debug.xprint (Protocol.string_of_payload payload));
           let (header, values) = Dl_Pprz.values_of_payload payload in
-          let msg = Dl_Pprz.message_of_id header.message_id in
+          let msg = Dl_Pprz.message_of_id header.PprzLink.message_id in
           Dl_Pprz.message_send "ground_dl" msg.PprzLink.name values in
 
         assert (PprzTransport.parse use_dl_message (Bytes.to_string b) = n)
diff --git a/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml b/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml
index 6dc3f45fc1..3265f4fd23 100644
--- a/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml
+++ b/sw/ground_segment/tmtc/ivy_tcp_aircraft.ml
@@ -53,7 +53,7 @@ let () =
         let use_dl_message = fun payload ->
           Debug.trace 'x' (Debug.xprint (Protocol.string_of_payload payload));
           let (header, values) = Dl_Pprz.values_of_payload payload in
-          let msg = Dl_Pprz.message_of_id header.message_id in
+          let msg = Dl_Pprz.message_of_id header.PprzLink.message_id in
           Dl_Pprz.message_send "ground_dl" msg.PprzLink.name values in
 
         assert (PprzTransport.parse use_dl_message (Bytes.to_string b) = n)
diff --git a/sw/ground_segment/tmtc/ivy_tcp_controller.ml b/sw/ground_segment/tmtc/ivy_tcp_controller.ml
index 9ec1b6859d..86e13aa6c8 100644
--- a/sw/ground_segment/tmtc/ivy_tcp_controller.ml
+++ b/sw/ground_segment/tmtc/ivy_tcp_controller.ml
@@ -40,8 +40,8 @@ let () =
         let use_tele_message = fun payload ->
           Debug.trace 'x' (Debug.xprint (Protocol.string_of_payload payload));
           let (header, values) = Tm_Pprz.values_of_payload payload in
-          let msg = Tm_Pprz.message_of_id header.message_id in
-          Tm_Pprz.message_send (string_of_int header.sender_id) msg.PprzLink.name values in
+          let msg = Tm_Pprz.message_of_id header.PprzLink.message_id in
+          Tm_Pprz.message_send (string_of_int header.PprzLink.sender_id) msg.PprzLink.name values in
 
         ignore (PprzTransport.parse use_tele_message (Bytes.to_string b))
       with
diff --git a/sw/ground_segment/tmtc/link.ml b/sw/ground_segment/tmtc/link.ml
index 8ac6afd27c..a8e7d43012 100644
--- a/sw/ground_segment/tmtc/link.ml
+++ b/sw/ground_segment/tmtc/link.ml
@@ -200,8 +200,8 @@ let use_tele_message = fun ?udp_peername ?raw_data_size payload ->
   Debug.call 'l' (fun f ->  fprintf f "pprz receiving: %s\n" (Debug.xprint buf));
   try
     let (header, values) = Tm_Pprz.values_of_payload payload in
-    let ac_id = header.sender_id in
-    let msg = Tm_Pprz.message_of_id header.message_id in
+    let ac_id = header.PprzLink.sender_id in
+    let msg = Tm_Pprz.message_of_id header.PprzLink.message_id in
     send_message_over_ivy (string_of_int ac_id) msg.PprzLink.name values;
     update_status ?udp_peername ac_id raw_data_size (msg.PprzLink.name = "PONG")
   with
diff --git a/sw/logalizer/sd2log.ml b/sw/logalizer/sd2log.ml
index 2de658e7f0..4895ae258a 100644
--- a/sw/logalizer/sd2log.ml
+++ b/sw/logalizer/sd2log.ml
@@ -143,8 +143,8 @@ let convert_file = fun ?(output_dir=None) file ->
       fprintf stderr "Invalid source (%d), skipping message\n" log_msg.Pprzlog_transport.source
     else
     let (header, vs) = values_of_payload log_msg log_msg.Pprzlog_transport.pprz_data in
-    let msg_id = header.message_id in
-    let ac_id = header.sender_id in
+    let msg_id = header.PprzLink.message_id in
+    let ac_id = header.PprzLink.sender_id in
 
     if log_msg.Pprzlog_transport.source = 0 && !single_ac_id < 0 then
       single_ac_id := ac_id;