diff --git a/libraries/base/diag/tb/vhdl/tb_diag_data_buffer_dev.vhd b/libraries/base/diag/tb/vhdl/tb_diag_data_buffer_dev.vhd
index 730f6e6fd09da0c50d49770af15a43ab66d7cb46..db534db27bf4700d18afb0d7516380f039b83d48 100644
--- a/libraries/base/diag/tb/vhdl/tb_diag_data_buffer_dev.vhd
+++ b/libraries/base/diag/tb/vhdl/tb_diag_data_buffer_dev.vhd
@@ -50,15 +50,15 @@ use mm_lib.mm_file_pkg.all;
 use dp_lib.dp_stream_pkg.all;
 use work.diag_pkg.all;
 
-entity tb_diag_data_buffer is
+entity tb_diag_data_buffer_dev is
   generic(
     g_nof_streams : positive :=  2;  -- = 16
     g_nof_data    : positive := 128;
     g_data_w      : positive :=  16  -- = 16
   );
-end tb_diag_data_buffer;
+end tb_diag_data_buffer_dev;
 
-architecture tb of tb_diag_data_buffer is
+architecture tb of tb_diag_data_buffer_dev is
   constant c_sim                : boolean := true;
 
   ----------------------------------------------------------------------------
@@ -257,7 +257,7 @@ begin
   ----------------------------------------------------------------------------
   -- DUT: Device Under Test
   ----------------------------------------------------------------------------
-  u_dut : entity work.mms_diag_data_buffer
+  u_dut : entity work.mms_diag_data_buffer_dev
   generic map (
     g_nof_streams     => c_db_nof_streams,
     g_data_type       => c_db_data_type_re,