diff --git a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd
index f89c620d5c5f92301e77a39a8eaa8fe8a8f6b037..d88b148655be20c41cc6f5a712b82ea5409a3c7b 100644
--- a/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd
+++ b/applications/apertif/designs/apertif_unb1_correlator/src/vhdl/node_apertif_unb1_correlator_mesh.vhd
@@ -367,7 +367,7 @@ END node_apertif_unb1_correlator_mesh;
 
 ARCHITECTURE str OF node_apertif_unb1_correlator_mesh IS
 
-  CONSTANT c_sel_apertif_cor: t_sel_table :=
+  CONSTANT c_sel_table: t_reorder_table :=
   (
    --FN0 FN1 FN2 FN3 BN0 BN1 BN2 BN3
     ( 19, 10, 13, 16, 8 , 8 , 8 , 8 , 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), -- Local processing output 0
@@ -723,7 +723,7 @@ BEGIN
   ---------------------------------------------------------------------------------------
   u_rewire : ENTITY reorder_lib.reorder_rewire
   GENERIC MAP(
-    g_select_table => c_sel_apertif_cor,
+    g_select_table => c_sel_table,
     g_nof_streams  => c_distr_nof_streams,
     g_sel_in_w     => ceil_log2(c_nof_nodes)
   )
diff --git a/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd b/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd
index c2ed2bc2ef0f4f829a0cb8103f70b3e6e7fc3acd..e58a737bd1bf405797ea83a7b45fb5e42c9ea28d 100644
--- a/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd
+++ b/libraries/base/reorder/src/vhdl/mms_reorder_rewire.vhd
@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL;
 
 ENTITY mms_reorder_rewire IS
   GENERIC (
-    g_select_table  : t_sel_table := c_sel_table;
+    g_select_table  : t_reorder_table := c_reorder_table;
     g_nof_streams   : NATURAL     := 8;
     g_sel_in_w      : NATURAL     := 3;
     g_use_sel_table : BOOLEAN     := TRUE
diff --git a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
index f829e8f3f0764b206c8f400a82450ed218c1b2c9..26346a2cf3be2db8ecd0d7eb6f783247d2c9065f 100644
--- a/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_pkg.vhd
@@ -38,9 +38,9 @@ PACKAGE reorder_pkg IS
   CONSTANT c_reorder_seq      : t_reorder_seq := (64, 16, 4, 1, 0, 5);  
   CONSTANT c_reorder_seq_same : t_reorder_seq := (64, 64, 1, 1, 0, 4);  
   
-  TYPE t_sel_table IS ARRAY(INTEGER RANGE 0 TO 31, INTEGER RANGE 0 TO 31) OF NATURAL; 
+  TYPE t_reorder_table IS ARRAY(INTEGER RANGE 0 TO 31, INTEGER RANGE 0 TO 31) OF NATURAL; 
 
-  CONSTANT c_sel_table: t_sel_table := 
+  CONSTANT c_reorder_table: t_reorder_table := 
   (
     (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
     (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0),
diff --git a/libraries/base/reorder/src/vhdl/reorder_rewire.vhd b/libraries/base/reorder/src/vhdl/reorder_rewire.vhd
index b3c329641ab66d49c6d61b60c700b545a6de2dc7..589a941c9fa05cf7ef5a395c7e3e8a9071f2d63b 100644
--- a/libraries/base/reorder/src/vhdl/reorder_rewire.vhd
+++ b/libraries/base/reorder/src/vhdl/reorder_rewire.vhd
@@ -57,7 +57,7 @@ USE work.reorder_pkg.ALL;
 
 ENTITY reorder_rewire IS
   GENERIC( 
-    g_select_table  : t_sel_table := c_sel_table;
+    g_select_table  : t_reorder_table := c_reorder_table;
     g_nof_streams   : NATURAL     := 8;
     g_sel_in_w      : NATURAL     := 3;
     g_use_sel_table : BOOLEAN     := TRUE
diff --git a/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd b/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd
index 78fd104b1524914afab261aa93a3ad5b60e0598f..b9627f72e41db969e03afae260bbd90ef189516c 100644
--- a/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd
+++ b/libraries/base/reorder/tb/vhdl/tb_mms_reorder_rewire.vhd
@@ -109,7 +109,7 @@ ARCHITECTURE tb OF tb_mms_reorder_rewire IS
   );
   END COMPONENT;   
 
-  CONSTANT c_sel_table: t_sel_table :=
+  CONSTANT c_sel_table: t_reorder_table :=
   (
    --FN0 FN1 FN2 FN3 BN0 BN1 BN2 BN3
     ( 19, 10, 13, 16, 8 , 8 , 8 , 8 , 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), -- Local processing output 0