diff --git a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_tbuf_pkg.vhd b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_tbuf_pkg.vhd
index 2b8cbab7709419dad1de68c172d1d5a1f783b444..7be2601fd9294a70e849e1eb1aae5ec0ae66ce0d 100644
--- a/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_tbuf_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/tb/vhdl/tb_sdp_tbuf_pkg.vhd
@@ -42,8 +42,8 @@ package tb_sdp_tbuf_pkg is
   function func_sdp_tbuf_fsm_arbiter_str(fsm_arbiter : natural) return string;
   function func_sdp_tbuf_fsm_writer_str(fsm_writer : natural) return string;
   function func_sdp_tbuf_fsm_reader_str(fsm_reader : natural) return string;
-  function func_sdp_tbuf_print_state(state_rec : t_sdp_tbuf_state) return boolean;
-  function func_sdp_tbuf_print_state(state_slv : std_logic_vector) return boolean;
+  function func_sdp_tbuf_print_state(prefix : string; state_rec : t_sdp_tbuf_state) return boolean;
+  function func_sdp_tbuf_print_state(prefix : string; state_slv : std_logic_vector) return boolean;
 
   -- Transient raw data output via 10GbE to CEP (= central processor)
   function func_sdp_tbuf_compose_cep_header(ip_src_addr             : std_logic_vector;
@@ -120,7 +120,7 @@ package body tb_sdp_tbuf_pkg is
     end case;
   end func_sdp_tbuf_fsm_reader_str;
 
-  function func_sdp_tbuf_print_state(state_rec : t_sdp_tbuf_state) return boolean is
+  function func_sdp_tbuf_print_state(prefix : string; state_rec : t_sdp_tbuf_state) return boolean is
     constant c_fsm_arbiter_str : string := func_sdp_tbuf_fsm_arbiter_str(
                                            to_uint(func_sdp_tbuf_fsm_arbiter_to_slv(state_rec.fsm_arbiter)));
     constant c_fsm_writer_str  : string := func_sdp_tbuf_fsm_writer_str(
@@ -128,29 +128,30 @@ package body tb_sdp_tbuf_pkg is
     constant c_fsm_reader_str  : string := func_sdp_tbuf_fsm_reader_str(
                                            to_uint(func_sdp_tbuf_fsm_reader_to_slv(state_rec.fsm_reader)));
   begin
-    print_str("tbuf_state:");
-    print_str(". ddr4_I_cal_ok           = " & sl_to_str(state_rec.ddr4_I_cal_ok));
-    print_str(". dvr_done                = " & sl_to_str(state_rec.dvr_done));
-    print_str(". fsm_arbiter             = " & c_fsm_arbiter_str);
-    print_str(". fsm_writer              = " & c_fsm_writer_str);
-    print_str("    record_enable         = " & sl_to_str(state_rec.record_enable));
-    print_str("    record_busy           = " & sl_to_str(state_rec.record_busy));
-    print_str("    record_all            = " & sl_to_str(state_rec.record_all));
-    print_str("    record_buf_full       = " & sl_to_str(state_rec.record_buf_full));
-    print_str("    record_sop_fifo_usedw = " & int_to_str(to_uint(state_rec.record_sop_fifo_usedw)));
-    print_str(". fsm_reader              = " & c_fsm_reader_str);
-    print_str("    dump_enables          = b" & slv_to_str(state_rec.dump_enables));
-    print_str("    dump_en               = " & sl_to_str(state_rec.dump_en));
-    print_str("    dump_busy             = " & sl_to_str(state_rec.dump_busy));
-    print_str("    dump_done             = " & sl_to_str(state_rec.dump_done));
-    print_str("    dump_ai               = " & int_to_str(state_rec.dump_ai));
+    print_str(prefix & "tbuf_state:");
+    print_str(prefix & ". ddr4_I_cal_ok           = " & sl_to_str(state_rec.ddr4_I_cal_ok));
+    print_str(prefix & ". dvr_done                = " & sl_to_str(state_rec.dvr_done));
+    print_str(prefix & ". fsm_arbiter             = " & c_fsm_arbiter_str);
+    print_str(prefix & ". fsm_writer              = " & c_fsm_writer_str);
+    print_str(prefix & "    record_enable         = " & sl_to_str(state_rec.record_enable));
+    print_str(prefix & "    record_busy           = " & sl_to_str(state_rec.record_busy));
+    print_str(prefix & "    record_all            = " & sl_to_str(state_rec.record_all));
+    print_str(prefix & "    record_buf_full       = " & sl_to_str(state_rec.record_buf_full));
+    print_str(prefix & "    record_sop_fifo_usedw = " & int_to_str(to_uint(state_rec.record_sop_fifo_usedw)));
+    print_str(prefix & ". fsm_reader              = " & c_fsm_reader_str);
+    print_str(prefix & "    dump_enables          = b" & slv_to_str(state_rec.dump_enables));
+    print_str(prefix & "    dump_en               = " & sl_to_str(state_rec.dump_en));
+    print_str(prefix & "    dump_busy             = " & sl_to_str(state_rec.dump_busy));
+    print_str(prefix & "    dump_done             = " & sl_to_str(state_rec.dump_done));
+    print_str(prefix & "    dump_ai               = " & int_to_str(state_rec.dump_ai));
+    print_str("");
     return true;
   end func_sdp_tbuf_print_state;
 
-  function func_sdp_tbuf_print_state(state_slv : std_logic_vector) return boolean is
+  function func_sdp_tbuf_print_state(prefix : string; state_slv : std_logic_vector) return boolean is
     constant c_state_rec : t_sdp_tbuf_state := func_sdp_tbuf_map_state(state_slv);
   begin
-    return func_sdp_tbuf_print_state(c_state_rec);
+    return func_sdp_tbuf_print_state(prefix, c_state_rec);
   end func_sdp_tbuf_print_state;
 
   function func_sdp_tbuf_compose_cep_header(ip_src_addr             : std_logic_vector;