diff --git a/applications/lofar1/pft2/src/vhdl/pft.vhd b/applications/lofar1/pft2/src/vhdl/pft.vhd
index 5ed7893acce62880092cabb6eeaa0a77092e500e..f6b11f2e02b9fcc7d4cb06abfc7bad7f92f0ee4f 100644
--- a/applications/lofar1/pft2/src/vhdl/pft.vhd
+++ b/applications/lofar1/pft2/src/vhdl/pft.vhd
@@ -26,9 +26,7 @@
 LIBRARY IEEE;
 USE IEEE.std_logic_1164.ALL;
 USE IEEE.numeric_std.ALL;
-
-LIBRARY pft2_lib;
-USE pft2_lib.pft_pkg.ALL;
+USE work.pft_pkg.ALL;
 
 
 ENTITY pft IS
@@ -130,7 +128,7 @@ BEGIN
   -- NB. The first stage has index c_nof_stages-1, the last stage has index 0.
   
   
-  switch: ENTITY pft2_lib.pft_switch
+  switch: ENTITY work.pft_switch
   GENERIC MAP (
     g_dat_w    => g_in_dat_w,
     g_fft_sz_w => g_fft_size_w
@@ -150,7 +148,7 @@ BEGIN
   );
 
   first_gen : IF (c_nof_stages>1) GENERATE
-    first_stage : ENTITY pft2_lib.pft_stage
+    first_stage : ENTITY work.pft_stage
       GENERIC MAP (
         g_index          => c_nof_stages-1,
         g_in_dat_w       => g_in_dat_w,
@@ -172,7 +170,7 @@ BEGIN
 
 
   middle_gen : FOR i IN c_nof_stages-2 DOWNTO 1 GENERATE
-    middle_stage : ENTITY pft2_lib.pft_stage
+    middle_stage : ENTITY work.pft_stage
       GENERIC MAP (
         g_index          => i,
         g_in_dat_w       => g_stage_dat_w,
@@ -193,7 +191,7 @@ BEGIN
   END GENERATE;
 
   last_gen : IF c_nof_stages>1 GENERATE
-    last_stage : ENTITY pft2_lib.pft_stage
+    last_stage : ENTITY work.pft_stage
       GENERIC MAP (
         g_index          => 0,
         g_in_dat_w       => g_stage_dat_w,
@@ -214,7 +212,7 @@ BEGIN
   END GENERATE;
 
   only_gen : IF c_nof_stages=1 GENERATE
-    only_stage : ENTITY pft2_lib.pft_stage
+    only_stage : ENTITY work.pft_stage
         GENERIC MAP (
           g_index          => 0,
           g_in_dat_w       => g_in_dat_w,
@@ -244,7 +242,7 @@ BEGIN
 
   buf_gen : IF g_mode /= PFT_MODE_BITREV GENERATE
 
-    buf : ENTITY pft2_lib.pft_buffer
+    buf : ENTITY work.pft_buffer
       GENERIC MAP (
         g_fft_size_w      => g_fft_size_w,
         g_dat_w           => c_pft_dat_w
@@ -268,7 +266,7 @@ BEGIN
 
 
    reverse_gen : IF g_mode = PFT_MODE_COMPLEX GENERATE
-    reverse : ENTITY pft2_lib.pft_reverse
+    reverse : ENTITY work.pft_reverse
       GENERIC MAP (
         g_fft_sz          => 2**g_fft_size_w,
         g_fft_sz_w        => g_fft_size_w,
@@ -294,7 +292,7 @@ BEGIN
 
 
   separate_gen : IF g_mode = PFT_MODE_REAL2 GENERATE
-    separate : ENTITY pft2_lib.pft_separate
+    separate : ENTITY work.pft_separate
       GENERIC MAP (
         g_fft_sz          => 2**g_fft_size_w,
         g_fft_sz_w        => g_fft_size_w,
@@ -318,7 +316,7 @@ BEGIN
       );
   END GENERATE;
 
-  unswitch: ENTITY pft2_lib.pft_unswitch
+  unswitch: ENTITY work.pft_unswitch
   GENERIC MAP (
     g_dat_w    => g_out_dat_w,
     g_fft_sz_w => g_fft_size_w