diff --git a/applications/apertif/apertif_unb1_correlator/hdllib.cfg b/applications/apertif/apertif_unb1_correlator/hdllib.cfg
index 33ffb4677386ec186fc2ab5d443ef4c4dd81e1a2..5373ee14b7ad37b09dcb46f9313aba3997c234bc 100644
--- a/applications/apertif/apertif_unb1_correlator/hdllib.cfg
+++ b/applications/apertif/apertif_unb1_correlator/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = apertif_unb1_correlator
 hdl_library_clause_name = apertif_unb1_correlator_lib
-hdl_lib_uses = common mm dp i2c unb1_board correlator diag rTwoSDF wpfb st filter fft
+hdl_lib_uses_synth = common mm dp i2c unb1_board correlator diag rTwoSDF wpfb st filter fft
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/applications/unb1_fn_bf/hdllib.cfg b/applications/unb1_fn_bf/hdllib.cfg
index 48a491211cd495fcb401fc064bb80d5ee3745fd5..4bb1c670e0143f3de7a3bbb2ec58e05cf6113519 100644
--- a/applications/unb1_fn_bf/hdllib.cfg
+++ b/applications/unb1_fn_bf/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_fn_bf
 hdl_library_clause_name = unb1_fn_bf_lib
-hdl_lib_uses = common technology mm i2c unb1_board bf
+hdl_lib_uses_synth = common technology mm i2c unb1_board bf
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg b/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg
index 3376cee56f42dbca153b44c5630f12587faa9698..ddb27e0fc5d11ef4aa6723ac5e97b7e9eeb7db90 100644
--- a/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_ddr3/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_ddr3
 hdl_library_clause_name = unb1_ddr3_lib
-hdl_lib_uses = common mm i2c unb1_board dp eth diagnostics ddr3
+hdl_lib_uses_synth = common mm i2c unb1_board dp eth diagnostics ddr3
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_minimal/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/hdllib.cfg
index 9d89bfae2eb09774dbf77874ca086b3aa508ac02..6f58f3789e41c410a8739637a66f02af2b57bd54 100644
--- a/boards/uniboard1/designs/unb1_minimal/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_minimal
 hdl_library_clause_name = unb1_minimal_lib
-hdl_lib_uses = common mm unb1_board 
+hdl_lib_uses_synth = common mm unb1_board 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg
index 10ae4f96e7c68162022ad2034dba1378915e5716..d21104440186f45833f8c4ed67171bc18dc07a2a 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_qsys/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_minimal_qsys
 hdl_library_clause_name = unb1_minimal_qsys_lib
-hdl_lib_uses = unb1_board unb1_minimal
+hdl_lib_uses_synth = unb1_board unb1_minimal
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg
index 78a350f963dad9c83a60deac4bbea9ea33ce0a40..9dcd2ff6edad1a78848a9ff246ac9b78f036e968 100644
--- a/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_minimal/revisions/unb1_minimal_sopc/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_minimal_sopc
 hdl_library_clause_name = unb1_minimal_sopc_lib
-hdl_lib_uses = unb1_board unb1_minimal
+hdl_lib_uses_synth = unb1_board unb1_minimal
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_test/hdllib.cfg b/boards/uniboard1/designs/unb1_test/hdllib.cfg
index 10371e316aa638f95eff68ea867470667aaf6cbf..259c382d40279c43e8f6ca59504c905dcae10e62 100644
--- a/boards/uniboard1/designs/unb1_test/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_test
 hdl_library_clause_name = unb1_test_lib
-hdl_lib_uses = common technology mm unb1_board dp eth tech_tse tr_10GbE mdio diagnostics diag
+hdl_lib_uses_synth = common technology mm unb1_board dp eth tech_tse tr_10GbE mdio diagnostics diag
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg
index 4c84606aa1436fb45c9fd893df97f529023f2680..90c7e2b467d820ffe253d6517dac86d2e21a5941 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_10GbE/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_test_10GbE
 hdl_library_clause_name = unb1_test_10GbE_lib
-hdl_lib_uses = unb1_board unb1_test
+hdl_lib_uses_synth = unb1_board unb1_test
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_lpbk/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_lpbk/hdllib.cfg
index f7ae6ab7823700b1d201103fca5d594ee32b1b01..9ed48f71cc641564f254c1aeaa6b9dd610978db2 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_lpbk/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_lpbk/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_test_lpbk
 hdl_library_clause_name = unb1_test_lpbk_lib
-hdl_lib_uses = unb1_board unb1_test
+hdl_lib_uses_synth = unb1_board unb1_test
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_qsys/hdllib.cfg b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_qsys/hdllib.cfg
index 5bb6b429c43b177e4fc91ca3eb29fc3e706ca852..52b1b693fcc834ab9fc67718b3c7b7cbc64dfce4 100644
--- a/boards/uniboard1/designs/unb1_test/revisions/unb1_test_qsys/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_test/revisions/unb1_test_qsys/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_test_qsys
 hdl_library_clause_name = unb1_test_qsys_lib
-hdl_lib_uses = unb1_board unb1_test
+hdl_lib_uses_synth = unb1_board unb1_test
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg b/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg
index 7fdfef6a08ec4468839107a58fb21bfe9c9c8d54..b7136c61a6c4bc2e177e4d7608dd6365e39a0736 100644
--- a/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg
+++ b/boards/uniboard1/designs/unb1_tr_10GbE/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_tr_10GbE
 hdl_library_clause_name = unb1_tr_10GbE_lib
-hdl_lib_uses = common mm i2c unb1_board dp eth tr_xaui tr_10GbE mdio diagnostics
+hdl_lib_uses_synth = common mm i2c unb1_board dp eth tr_xaui tr_10GbE mdio diagnostics
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard1/libraries/unb1_board/hdllib.cfg b/boards/uniboard1/libraries/unb1_board/hdllib.cfg
index e19c8852516e2193aa69d1a67e1db9076ef7e98a..802becfe6afb0bc82eb11df4944544dbeaf2ffb3 100644
--- a/boards/uniboard1/libraries/unb1_board/hdllib.cfg
+++ b/boards/uniboard1/libraries/unb1_board/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb1_board
 hdl_library_clause_name = unb1_board_lib
-hdl_lib_uses = common dp diag uth ppsh i2c tr_nonbonded eth remu technology tech_pll epcs
+hdl_lib_uses_synth = common dp diag uth ppsh i2c tr_nonbonded eth remu technology tech_pll epcs
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_stratixiv
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard2/designs/unb2_minimal/hdllib.cfg b/boards/uniboard2/designs/unb2_minimal/hdllib.cfg
index 86fdea1c3bcf467188cc3638c327a0ff7be41d14..7f093c26788c5d7078d9552932985973828cfcc5 100644
--- a/boards/uniboard2/designs/unb2_minimal/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_minimal/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb2_minimal
 hdl_library_clause_name = unb2_minimal_lib
-hdl_lib_uses = common technology mm unb2_board 
+hdl_lib_uses_synth = common technology mm unb2_board 
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR
diff --git a/boards/uniboard2/designs/unb2_test/hdllib.cfg b/boards/uniboard2/designs/unb2_test/hdllib.cfg
index 86dae878650fcc30515769e711843719de1f1429..a42c875275d9155e93bedc15681b381ac158f90b 100644
--- a/boards/uniboard2/designs/unb2_test/hdllib.cfg
+++ b/boards/uniboard2/designs/unb2_test/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb2_test
 hdl_library_clause_name = unb2_test_lib
-hdl_lib_uses = common technology mm unb2_board dp eth tech_tse tr_10GbE diagnostics diag
+hdl_lib_uses_synth = common technology mm unb2_board dp eth tech_tse tr_10GbE diagnostics diag
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 
diff --git a/boards/uniboard2/libraries/unb2_board/hdllib.cfg b/boards/uniboard2/libraries/unb2_board/hdllib.cfg
index ef2597d8b99f4c29dee855d787c3a9cb902a24ee..8d1245b17dca2e0d78483f6fc95682cfc5e48b56 100644
--- a/boards/uniboard2/libraries/unb2_board/hdllib.cfg
+++ b/boards/uniboard2/libraries/unb2_board/hdllib.cfg
@@ -1,6 +1,8 @@
 hdl_lib_name = unb2_board
 hdl_library_clause_name = unb2_board_lib
-hdl_lib_uses = common dp diag uth ppsh i2c tr_nonbonded eth remu technology tech_pll epcs tr_10GbE
+hdl_lib_uses_synth = common dp diag uth ppsh i2c tr_nonbonded eth remu technology tech_pll epcs tr_10GbE
+hdl_lib_uses_sim = 
+
 hdl_lib_technology = ip_arria10
 
 build_dir_sim = $HDL_BUILD_DIR