diff --git a/lib/lpp/dirs.txt b/lib/lpp/dirs.txt
--- a/lib/lpp/dirs.txt
+++ b/lib/lpp/dirs.txt
@@ -6,6 +6,7 @@
 ./general_purpose/lpp_AMR
 ./general_purpose/lpp_balise
 ./general_purpose/lpp_delay
+./lfr_time_management
 ./lpp_ad_Conv
 ./lpp_amba
 ./lpp_bootloader
@@ -17,4 +18,4 @@
 ./lpp_top_lfr
 ./lpp_uart
 ./lpp_usb
-./lfr_time_management
+./lpp_waveform
diff --git a/lib/lpp/lpp_dma/vhdlsyn.txt b/lib/lpp/lpp_dma/vhdlsyn.txt
--- a/lib/lpp/lpp_dma/vhdlsyn.txt
+++ b/lib/lpp/lpp_dma/vhdlsyn.txt
@@ -1,7 +1,7 @@
+lpp_dma_pkg.vhd
 fifo_latency_correction.vhd
 lpp_dma.vhd
 lpp_dma_apbreg.vhd
 lpp_dma_ip.vhd
-lpp_dma_pkg.vhd
 lpp_dma_send_16word.vhd
 lpp_dma_send_1word.vhd
diff --git a/lib/lpp/lpp_top_lfr/lpp_top_lfr_wf_picker_ip.vhd b/lib/lpp/lpp_top_lfr/lpp_top_lfr_wf_picker_ip.vhd
--- a/lib/lpp/lpp_top_lfr/lpp_top_lfr_wf_picker_ip.vhd
+++ b/lib/lpp/lpp_top_lfr/lpp_top_lfr_wf_picker_ip.vhd
@@ -214,7 +214,7 @@ BEGIN
   IIR_CEL_CTRLR_v2_1 : IIR_CEL_CTRLR_v2
     GENERIC MAP (
       tech         => 0,
-      Mem_use      => use_CEL,          -- use_RAM
+      Mem_use      => use_RAM,          -- use_RAM
       Sample_SZ    => 18,
       Coef_SZ      => Coef_SZ,
       Coef_Nb      => 25,
diff --git a/lib/lpp/lpp_top_lfr/vhdlsyn.txt b/lib/lpp/lpp_top_lfr/vhdlsyn.txt
--- a/lib/lpp/lpp_top_lfr/vhdlsyn.txt
+++ b/lib/lpp/lpp_top_lfr/vhdlsyn.txt
@@ -1,3 +1,4 @@
-lpp_top_acq.vhd
-lpp_top_lfr.vhd
 lpp_top_lfr_pkg.vhd
+lpp_top_apbreg.vhd
+lpp_top_lfr_wf_picker.vhd
+lpp_top_lfr_wf_picker_ip.vhd
diff --git a/lib/lpp/lpp_waveform/vhdlsyn.txt b/lib/lpp/lpp_waveform/vhdlsyn.txt
--- a/lib/lpp/lpp_waveform/vhdlsyn.txt
+++ b/lib/lpp/lpp_waveform/vhdlsyn.txt
@@ -1,9 +1,12 @@
 lpp_waveform_pkg.vhd
 lpp_waveform.vhd
-lpp_waveform_snapshot_controler.vhd
-lpp_waveform_snapshot.vhd
 lpp_waveform_burst.vhd
 lpp_waveform_dma.vhd
-lpp_waveform_dma_send_Nword.vhd
+lpp_waveform_dma_genvalid.vhd
 lpp_waveform_dma_selectaddress.vhd
-lpp_waveform_dma_genvalid.vhd
+lpp_waveform_dma_send_Nword.vhd
+lpp_waveform_fifo.vhd
+lpp_waveform_fifo_arbiter.vhd
+lpp_waveform_fifo_ctrl.vhd
+lpp_waveform_snapshot.vhd
+lpp_waveform_snapshot_controler.vhd