diff --git a/applications/apertif/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd b/applications/apertif/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd
index 58e7487da12c8fa7acb2656a199154b7d74f2fc4..81ceab91cc27c64bc225b99ab9a504a1298d6205 100644
--- a/applications/apertif/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd
+++ b/applications/apertif/apertif_unb1_fn_beamformer/src/vhdl/node_apertif_unb1_fn_beamformer.vhd
@@ -19,7 +19,7 @@
 --
 -------------------------------------------------------------------------------
 
-LIBRARY IEEE, common_lib, unb1_board_lib, eth_lib, tech_tse_lib, dp_lib, bf_lib, unb1_fn_bf_lib, unb1_fn_terminal_db_lib;
+LIBRARY IEEE, common_lib, unb1_board_lib, eth_lib, tech_tse_lib, dp_lib, bf_lib;
 USE IEEE.STD_LOGIC_1164.ALL;
 USE IEEE.NUMERIC_STD.ALL;
 USE common_lib.common_pkg.ALL;
@@ -129,7 +129,7 @@ BEGIN
   -----------------------------------------------------------------------------
   -- Node function: Beam Former + BF UDP offload + block generator
   -----------------------------------------------------------------------------  
-  u_node_fn_bf : ENTITY unb1_fn_bf_lib.node_unb1_fn_bf
+  u_node_fn_bf : ENTITY bf_lib.node_unb1_fn_bf
   GENERIC MAP(
     g_bf                    => c_bf,
     g_bf_offload            => g_use_bf_offload,
@@ -189,7 +189,7 @@ BEGIN
   -----------------------------------------------------------------------------
   -- Node function: Terminals + data buffer
   -----------------------------------------------------------------------------  
-  u_node_fn_terminal_db : ENTITY unb1_fn_terminal_db_lib.node_unb1_fn_terminal_db
+  u_node_fn_terminal_db : ENTITY unb1_board_lib.node_unb1_fn_terminal_db
   GENERIC MAP(
     g_sim                       => g_sim,
     g_sim_level                 => g_sim_level,