diff --git a/libraries/base/dp/hdllib.cfg b/libraries/base/dp/hdllib.cfg
index ce0c6d9f2373328d179fc7890af6b4d95562acaf..8b2022a4e2e5cf70c51e1bab20f1ff8b7afb197b 100644
--- a/libraries/base/dp/hdllib.cfg
+++ b/libraries/base/dp/hdllib.cfg
@@ -74,7 +74,7 @@ synth_files =
     $UNB/Firmware/modules/dp/src/vhdl/dp_frame.vhd
     $UNB/Firmware/modules/dp/src/vhdl/dp_unframe.vhd
     $UNB/Firmware/modules/dp/src/vhdl/dp_repack.vhd
-    src/vhdl/dp_repack_dev.vhd
+    src/vhdl/dp_repack_data.vhd
     $UNB/Firmware/modules/dp/src/vhdl/dp_frame_repack.vhd
     $UNB/Firmware/modules/dp/src/vhdl/dp_frame_scheduler.vhd
     $UNB/Firmware/modules/dp/src/vhdl/dp_packet_enc.vhd
@@ -169,7 +169,7 @@ test_bench_files =
     $UNB/Firmware/modules/dp/tb/vhdl/tb_dp_pipeline_ready.vhd
     tb/vhdl/tb_dp_reinterleave.vhd
     tb/vhdl/tb_dp_repack.vhd
-    tb/vhdl/tb_dp_repack_dev.vhd
+    tb/vhdl/tb_dp_repack_data.vhd
     $UNB/Firmware/modules/dp/tb/vhdl/tb_dp_shiftreg.vhd
     $UNB/Firmware/modules/dp/tb/vhdl/tb_dp_split.vhd
     $UNB/Firmware/modules/dp/tb/vhdl/tb_dp_tail_remove.vhd
@@ -206,7 +206,7 @@ test_bench_files =
     $UNB/Firmware/modules/dp/tb/vhdl/tb_tb_dp_packet_merge.vhd
     $UNB/Firmware/modules/dp/tb/vhdl/tb_tb_dp_pipeline.vhd
     $UNB/Firmware/modules/dp/tb/vhdl/tb_tb_dp_pipeline_ready.vhd
-    tb/vhdl/tb_tb_dp_repack_dev.vhd
+    tb/vhdl/tb_tb_dp_repack_data.vhd
     $UNB/Firmware/modules/dp/tb/vhdl/tb_tb_dp_split.vhd
     tb/vhdl/tb_tb_dp_sync_checker.vhd
     
diff --git a/libraries/base/dp/src/vhdl/dp_example_dut.vhd b/libraries/base/dp/src/vhdl/dp_example_dut.vhd
index 6a825d763d858b251723c203d3f96aa614b4a87d..3e65fdd001134b8e67f48c2cf36beb2b06c19ee7 100644
--- a/libraries/base/dp/src/vhdl/dp_example_dut.vhd
+++ b/libraries/base/dp/src/vhdl/dp_example_dut.vhd
@@ -158,7 +158,7 @@
 --   and e_random for snk_out.
 --
 -- Remarks:
--- . dp_repack_dev provides two usage examples of this dp_example_dut and of
+-- . dp_repack_data provides two usage examples of this dp_example_dut and of
 --   the dp_stream_stimuli and dp_stream_verify components that are used in
 --   the test bench.
 
diff --git a/libraries/base/dp/src/vhdl/dp_repack_dev.vhd b/libraries/base/dp/src/vhdl/dp_repack_data.vhd
similarity index 100%
rename from libraries/base/dp/src/vhdl/dp_repack_dev.vhd
rename to libraries/base/dp/src/vhdl/dp_repack_data.vhd
diff --git a/libraries/base/dp/tb/vhdl/tb_dp_repack_dev.vhd b/libraries/base/dp/tb/vhdl/tb_dp_repack_data.vhd
similarity index 100%
rename from libraries/base/dp/tb/vhdl/tb_dp_repack_dev.vhd
rename to libraries/base/dp/tb/vhdl/tb_dp_repack_data.vhd
diff --git a/libraries/base/dp/tb/vhdl/tb_tb_dp_repack_dev.vhd b/libraries/base/dp/tb/vhdl/tb_tb_dp_repack_data.vhd
similarity index 100%
rename from libraries/base/dp/tb/vhdl/tb_tb_dp_repack_dev.vhd
rename to libraries/base/dp/tb/vhdl/tb_tb_dp_repack_data.vhd
diff --git a/libraries/base/dp/tb/vhdl/tb_tb_tb_dp_backpressure.vhd b/libraries/base/dp/tb/vhdl/tb_tb_tb_dp_backpressure.vhd
index fc5d5db4514af3cdd9dab8a4deb266b539ed8311..609cd4ebf283c01b39edadd14bf32142a3b58645 100644
--- a/libraries/base/dp/tb/vhdl/tb_tb_tb_dp_backpressure.vhd
+++ b/libraries/base/dp/tb/vhdl/tb_tb_tb_dp_backpressure.vhd
@@ -68,6 +68,7 @@ BEGIN
   u_tb_tb_dp_pad_insert_remove    : ENTITY work.tb_tb_dp_pad_insert_remove;
   u_tb_tb_dp_pipeline             : ENTITY work.tb_tb_dp_pipeline;
   u_tb_tb_dp_pipeline_ready       : ENTITY work.tb_tb_dp_pipeline_ready;
+  u_tb_tb_dp_repack_data          : ENTITY work.tb_tb_dp_repack_data;
   u_tb_tb_dp_split                : ENTITY work.tb_tb_dp_split;
   
   -- Extra multi TB