diff --git a/libraries/base/reorder/src/vhdl/reorder_row.vhd b/libraries/base/reorder/src/vhdl/reorder_row.vhd
index a717bcc85e371b276375ffc632fe5a8543aa4ee9..3af0609a3656afcdd6cc0e5fada7405a635bb2b5 100644
--- a/libraries/base/reorder/src/vhdl/reorder_row.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_row.vhd
@@ -38,7 +38,7 @@ USE dp_lib.dp_stream_pkg.ALL;
 -- Remarks:
 --
 
-ENTITY ss_reorder IS
+ENTITY reorder_row IS
   GENERIC (                         
     g_dsp_data_w    : NATURAL := 16;
     g_frame_size    : NATURAL := 256;
@@ -64,9 +64,9 @@ ENTITY ss_reorder IS
     output_sosi_arr     : OUT t_dp_sosi_arr(g_nof_outputs-1 DOWNTO 0);   
     output_siso_arr     : IN  t_dp_siso_arr(g_nof_outputs-1 DOWNTO 0) := (OTHERS => c_dp_siso_rdy)
   );
-END ss_reorder;
+END reorder_row;
 
-ARCHITECTURE str OF ss_reorder IS
+ARCHITECTURE str OF reorder_row IS
   
   CONSTANT c_sel_buf_read_lat    : NATURAL := 1;            -- Latency introduced by the counter. 
   CONSTANT c_tot_pipeline        : NATURAL := g_pipeline_in + g_pipeline_in_m + g_pipeline_out + c_sel_buf_read_lat;