diff --git a/library/axi_ad5766/axi_ad5766_ip.tcl b/library/axi_ad5766/axi_ad5766_ip.tcl
index 376199cc1..b8a16eb87 100644
--- a/library/axi_ad5766/axi_ad5766_ip.tcl
+++ b/library/axi_ad5766/axi_ad5766_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad5766
 adi_ip_files axi_ad5766 [list \
     "$ad_hdl_dir/library/common/up_xfer_cntrl.v" \
@@ -15,12 +13,11 @@ adi_ip_files axi_ad5766 [list \
     "$ad_hdl_dir/library/common/up_axi.v" \
     "$ad_hdl_dir/library/common/util_pulse_gen.v" \
     "up_ad5766_sequencer.v" \
-    "axi_ad5766.v" \
-    "bd/bd.tcl" ]
+    "axi_ad5766.v" ]
 
 adi_ip_properties axi_ad5766
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad5766 "bd/bd.tcl"
 
 adi_ip_add_core_dependencies { \
diff --git a/library/axi_ad6676/axi_ad6676_ip.tcl b/library/axi_ad6676/axi_ad6676_ip.tcl
index a62d17e87..df20580aa 100644
--- a/library/axi_ad6676/axi_ad6676_ip.tcl
+++ b/library/axi_ad6676/axi_ad6676_ip.tcl
@@ -3,16 +3,13 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad6676
 adi_ip_files axi_ad6676 [list \
-  "axi_ad6676.v" \
-  "bd/bd.tcl" ]
+  "axi_ad6676.v" ]
 
 adi_ip_properties axi_ad6676
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad6676 "bd/bd.tcl"
 
 adi_ip_add_core_dependencies { \
diff --git a/library/axi_ad9122/axi_ad9122_ip.tcl b/library/axi_ad9122/axi_ad9122_ip.tcl
index e80abf874..d6343e1b0 100644
--- a/library/axi_ad9122/axi_ad9122_ip.tcl
+++ b/library/axi_ad9122/axi_ad9122_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9122
 adi_ip_files axi_ad9122 [list \
   "$ad_hdl_dir/library/xilinx/common/ad_mul.v" \
@@ -32,12 +30,11 @@ adi_ip_files axi_ad9122 [list \
   "axi_ad9122_core.v" \
   "axi_ad9122_if.v" \
   "axi_ad9122_constr.xdc" \
-  "axi_ad9122.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9122.v" ]
 
 adi_ip_properties axi_ad9122
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9122 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dac_sync_in* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9144/axi_ad9144_ip.tcl b/library/axi_ad9144/axi_ad9144_ip.tcl
index e1efa7d38..3e97db2e9 100644
--- a/library/axi_ad9144/axi_ad9144_ip.tcl
+++ b/library/axi_ad9144/axi_ad9144_ip.tcl
@@ -3,16 +3,13 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9144
 adi_ip_files axi_ad9144 [list \
-  "axi_ad9144.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9144.v" ]
 
 adi_ip_properties axi_ad9144
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9144 "bd/bd.tcl"
 
 adi_ip_add_core_dependencies { \
diff --git a/library/axi_ad9152/axi_ad9152_ip.tcl b/library/axi_ad9152/axi_ad9152_ip.tcl
index 16b29d851..226486c94 100644
--- a/library/axi_ad9152/axi_ad9152_ip.tcl
+++ b/library/axi_ad9152/axi_ad9152_ip.tcl
@@ -3,16 +3,13 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9152
 adi_ip_files axi_ad9152 [list \
-  "axi_ad9152.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9152.v" ]
 
 adi_ip_properties axi_ad9152
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9152 "bd/bd.tcl"
 
 adi_ip_add_core_dependencies { \
diff --git a/library/axi_ad9162/axi_ad9162_ip.tcl b/library/axi_ad9162/axi_ad9162_ip.tcl
index 75ba394e0..fa6fb89ac 100644
--- a/library/axi_ad9162/axi_ad9162_ip.tcl
+++ b/library/axi_ad9162/axi_ad9162_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9162
 adi_ip_files axi_ad9162 [list \
   "$ad_hdl_dir/library/xilinx/common/up_xfer_cntrl_constr.xdc" \
@@ -27,12 +25,11 @@ adi_ip_files axi_ad9162 [list \
   "axi_ad9162_channel.v" \
   "axi_ad9162_core.v" \
   "axi_ad9162_if.v" \
-  "axi_ad9162.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9162.v" ]
 
 adi_ip_properties axi_ad9162
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9122 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dunf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9250/axi_ad9250_ip.tcl b/library/axi_ad9250/axi_ad9250_ip.tcl
index 01655ae07..695a457a6 100644
--- a/library/axi_ad9250/axi_ad9250_ip.tcl
+++ b/library/axi_ad9250/axi_ad9250_ip.tcl
@@ -3,16 +3,13 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9250
 adi_ip_files axi_ad9250 [list \
-  "axi_ad9250.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9250.v" ]
 
 adi_ip_properties axi_ad9250
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9250 "bd/bd.tcl"
 
 adi_ip_add_core_dependencies { \
diff --git a/library/axi_ad9265/axi_ad9265_ip.tcl b/library/axi_ad9265/axi_ad9265_ip.tcl
index f740fe27f..ceee0c25c 100644
--- a/library/axi_ad9265/axi_ad9265_ip.tcl
+++ b/library/axi_ad9265/axi_ad9265_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9265
 adi_ip_files axi_ad9265 [list \
   "$ad_hdl_dir/library/common/ad_rst.v" \
@@ -27,12 +25,11 @@ adi_ip_files axi_ad9265 [list \
   "axi_ad9265_pnmon.v" \
   "axi_ad9265_if.v" \
   "axi_ad9265_channel.v" \
-  "axi_ad9265.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9265.v" ]
 
 adi_ip_properties axi_ad9265
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9265 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9361/axi_ad9361_ip.tcl b/library/axi_ad9361/axi_ad9361_ip.tcl
index cab865248..27925abd4 100644
--- a/library/axi_ad9361/axi_ad9361_ip.tcl
+++ b/library/axi_ad9361/axi_ad9361_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9361
 adi_ip_files axi_ad9361 [list \
   "$ad_hdl_dir/library/common/ad_rst.v" \
@@ -50,13 +48,12 @@ adi_ip_files axi_ad9361 [list \
   "axi_ad9361_tx.v" \
   "axi_ad9361_tdd.v" \
   "axi_ad9361_tdd_if.v" \
-  "axi_ad9361.v" \
-  "bd/bd.tcl"]
+  "axi_ad9361.v" ]
 
 adi_ip_properties axi_ad9361
 adi_ip_ttcl axi_ad9361 "$ad_hdl_dir/library/common/ad_pps_receiver_constr.ttcl"
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9361 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *rx_clk_in* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9371/axi_ad9371_ip.tcl b/library/axi_ad9371/axi_ad9371_ip.tcl
index 8379c8254..8efe8bef2 100644
--- a/library/axi_ad9371/axi_ad9371_ip.tcl
+++ b/library/axi_ad9371/axi_ad9371_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9371
 adi_ip_files axi_ad9371 [list \
   "$ad_hdl_dir/library/xilinx/common/up_xfer_cntrl_constr.xdc" \
@@ -37,12 +35,11 @@ adi_ip_files axi_ad9371 [list \
   "axi_ad9371_rx_os.v" \
   "axi_ad9371_tx_channel.v" \
   "axi_ad9371_tx.v" \
-  "axi_ad9371.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9371.v" ]
 
 adi_ip_properties axi_ad9371
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9371 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9434/axi_ad9434_ip.tcl b/library/axi_ad9434/axi_ad9434_ip.tcl
index 11bf4aa9b..eb652edab 100644
--- a/library/axi_ad9434/axi_ad9434_ip.tcl
+++ b/library/axi_ad9434/axi_ad9434_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9434
 adi_ip_files axi_ad9434 [list \
   "$ad_hdl_dir/library/xilinx/common/ad_serdes_clk.v" \
@@ -28,12 +26,11 @@ adi_ip_files axi_ad9434 [list \
   "axi_ad9434_pnmon.v" \
   "axi_ad9434_core.v" \
   "axi_ad9434_constr.xdc" \
-  "axi_ad9434.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9434.v" ]
 
 adi_ip_properties axi_ad9434
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9122 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9467/axi_ad9467_ip.tcl b/library/axi_ad9467/axi_ad9467_ip.tcl
index 143038f49..c273113c9 100644
--- a/library/axi_ad9467/axi_ad9467_ip.tcl
+++ b/library/axi_ad9467/axi_ad9467_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9467
 adi_ip_files axi_ad9467 [list \
   "$ad_hdl_dir/library/common/ad_rst.v" \
@@ -26,12 +24,11 @@ adi_ip_files axi_ad9467 [list \
   "axi_ad9467_pnmon.v" \
   "axi_ad9467_if.v" \
   "axi_ad9467_channel.v" \
-  "axi_ad9467.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9467.v" ]
 
 adi_ip_properties axi_ad9467
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9467 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9625/axi_ad9625_ip.tcl b/library/axi_ad9625/axi_ad9625_ip.tcl
index b7b55646c..814d617ef 100644
--- a/library/axi_ad9625/axi_ad9625_ip.tcl
+++ b/library/axi_ad9625/axi_ad9625_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9625
 adi_ip_files axi_ad9625 [list \
   "$ad_hdl_dir/library/common/ad_rst.v" \
@@ -25,12 +23,11 @@ adi_ip_files axi_ad9625 [list \
   "axi_ad9625_pnmon.v" \
   "axi_ad9625_channel.v" \
   "axi_ad9625_if.v" \
-  "axi_ad9625.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9625.v" ]
 
 adi_ip_properties axi_ad9625
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9122 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9671/axi_ad9671_ip.tcl b/library/axi_ad9671/axi_ad9671_ip.tcl
index 3ed2be2f4..3b25e9e6e 100644
--- a/library/axi_ad9671/axi_ad9671_ip.tcl
+++ b/library/axi_ad9671/axi_ad9671_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9671
 adi_ip_files axi_ad9671 [list \
   "$ad_hdl_dir/library/common/ad_rst.v" \
@@ -25,12 +23,11 @@ adi_ip_files axi_ad9671 [list \
   "axi_ad9671_pnmon.v" \
   "axi_ad9671_channel.v" \
   "axi_ad9671_if.v" \
-  "axi_ad9671.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9671.v" ]
 
 adi_ip_properties axi_ad9671
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9371 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *rx_valid* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9680/axi_ad9680_ip.tcl b/library/axi_ad9680/axi_ad9680_ip.tcl
index b492e75d0..cce30357d 100644
--- a/library/axi_ad9680/axi_ad9680_ip.tcl
+++ b/library/axi_ad9680/axi_ad9680_ip.tcl
@@ -3,16 +3,13 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9680
 adi_ip_files axi_ad9680 [list \
-  "axi_ad9680.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9680.v" ]
 
 adi_ip_properties axi_ad9680
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9680 "bd/bd.tcl"
 
 adi_ip_add_core_dependencies { \
diff --git a/library/axi_ad9684/axi_ad9684_ip.tcl b/library/axi_ad9684/axi_ad9684_ip.tcl
index 5ec5a32e1..84bfbc5c9 100644
--- a/library/axi_ad9684/axi_ad9684_ip.tcl
+++ b/library/axi_ad9684/axi_ad9684_ip.tcl
@@ -4,8 +4,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9684
 adi_ip_files axi_ad9684 [list \
   "$ad_hdl_dir/library/common/ad_rst.v" \
@@ -29,12 +27,11 @@ adi_ip_files axi_ad9684 [list \
   "axi_ad9684_if.v" \
   "axi_ad9684_channel.v" \
   "axi_ad9684_constr.xdc" \
-  "axi_ad9684.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9684.v" ]
 
 adi_ip_properties axi_ad9684
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9684 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9739a/axi_ad9739a_ip.tcl b/library/axi_ad9739a/axi_ad9739a_ip.tcl
index 8afbaf538..69893d9d2 100644
--- a/library/axi_ad9739a/axi_ad9739a_ip.tcl
+++ b/library/axi_ad9739a/axi_ad9739a_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9739a
 adi_ip_files axi_ad9739a [list \
   "$ad_hdl_dir/library/xilinx/common/ad_mul.v" \
@@ -29,12 +27,11 @@ adi_ip_files axi_ad9739a [list \
   "axi_ad9739a_channel.v" \
   "axi_ad9739a_core.v" \
   "axi_ad9739a_if.v" \
-  "axi_ad9739a.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9739a.v" ]
 
 adi_ip_properties axi_ad9739a
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9739a "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dunf* -of_objects [ipx::current_core]]
diff --git a/library/axi_ad9963/axi_ad9963_ip.tcl b/library/axi_ad9963/axi_ad9963_ip.tcl
index 6fe5cd0fb..ffad81495 100644
--- a/library/axi_ad9963/axi_ad9963_ip.tcl
+++ b/library/axi_ad9963/axi_ad9963_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_ad9963
 adi_ip_files axi_ad9963 [list \
   "$ad_hdl_dir/library/xilinx/common/up_xfer_cntrl_constr.xdc" \
@@ -40,12 +38,11 @@ adi_ip_files axi_ad9963 [list \
   "axi_ad9963_rx.v" \
   "axi_ad9963_tx_channel.v" \
   "axi_ad9963_tx.v" \
-  "axi_ad9963.v" \
-  "bd/bd.tcl" ]
+  "axi_ad9963.v" ]
 
 adi_ip_properties axi_ad9963
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9963 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dac_sync_in* -of_objects [ipx::current_core]]
diff --git a/library/axi_adrv9009/axi_adrv9009_ip.tcl b/library/axi_adrv9009/axi_adrv9009_ip.tcl
index d585386c2..407a016ff 100644
--- a/library/axi_adrv9009/axi_adrv9009_ip.tcl
+++ b/library/axi_adrv9009/axi_adrv9009_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_adrv9009
 adi_ip_files axi_adrv9009 [list \
   "$ad_hdl_dir/library/xilinx/common/up_xfer_cntrl_constr.xdc" \
@@ -37,12 +35,11 @@ adi_ip_files axi_adrv9009 [list \
   "axi_adrv9009_rx_os.v" \
   "axi_adrv9009_tx_channel.v" \
   "axi_adrv9009_tx.v" \
-  "axi_adrv9009.v" \
-  "bd/bd.tcl" ]
+  "axi_adrv9009.v" ]
 
 adi_ip_properties axi_adrv9009
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_adrv9009 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *dovf* -of_objects [ipx::current_core]]
diff --git a/library/axi_fmcadc5_sync/axi_fmcadc5_sync_ip.tcl b/library/axi_fmcadc5_sync/axi_fmcadc5_sync_ip.tcl
index 2525d2300..e0a3bb1c7 100644
--- a/library/axi_fmcadc5_sync/axi_fmcadc5_sync_ip.tcl
+++ b/library/axi_fmcadc5_sync/axi_fmcadc5_sync_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_fmcadc5_sync
 adi_ip_files axi_fmcadc5_sync [list \
   "$ad_hdl_dir/library/xilinx/common/ad_data_out.v" \
@@ -12,12 +10,11 @@ adi_ip_files axi_fmcadc5_sync [list \
   "$ad_hdl_dir/library/common/up_axi.v" \
   "axi_fmcadc5_sync_constr.xdc" \
   "axi_fmcadc5_sync_calcor.v" \
-  "axi_fmcadc5_sync.v" \
-  "bd/bd.tcl" ]
+  "axi_fmcadc5_sync.v" ]
 
 adi_ip_properties axi_fmcadc5_sync
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_fmcadc5_sync "bd/bd.tcl"
 
 ipx::infer_bus_interface rx_clk xilinx.com:signal:clock_rtl:1.0 [ipx::current_core]
diff --git a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
index c2c54166a..bc60564a9 100644
--- a/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
+++ b/library/axi_hdmi_tx/axi_hdmi_tx_ip.tcl
@@ -3,8 +3,6 @@
 source ../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_hdmi_tx
 adi_ip_files axi_hdmi_tx [list \
   "$ad_hdl_dir/library/common/ad_mem.v" \
@@ -26,12 +24,11 @@ adi_ip_files axi_hdmi_tx [list \
   "axi_hdmi_tx_vdma.v" \
   "axi_hdmi_tx_es.v" \
   "axi_hdmi_tx_core.v" \
-  "axi_hdmi_tx.v" \
-  "bd/bd.tcl" ]
+  "axi_hdmi_tx.v" ]
 
 adi_ip_properties axi_hdmi_tx
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_ad9122 "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports *hsync* -of_objects [ipx::current_core]]
diff --git a/library/scripts/adi_ip.tcl b/library/scripts/adi_ip.tcl
index d1bd1afab..4a460f6f3 100644
--- a/library/scripts/adi_ip.tcl
+++ b/library/scripts/adi_ip.tcl
@@ -318,28 +318,16 @@ proc adi_ip_properties {ip_name} {
 # - axi_clkgen
 proc adi_init_bd_tcl {} {
 
-  if { [file exists bd] } {
-    file delete -force bd
-  }
-  file mkdir bd
-  set bd_tcl [open "bd/bd.tcl" w]
-  puts $bd_tcl ""
-  close $bd_tcl
-
-  set local_mk [open "temporary_case_dependencies.mk" w]
-  seek $local_mk 0 start
-  puts $local_mk "CLEAN_TARGET += bd"
-  puts $local_mk "CLEAN_TARGET += temporary_case_dependencies.mk"
-  close $local_mk
-}
-
-proc adi_auto_fill_bd_tcl {} {
-
   global auto_set_param_list
   global auto_set_param_list_overwritable
   set cc [ipx::current_core]
 
-  set bd_tcl [open "bd/bd.tcl" r+ ]
+  if { [file exists bd] } {
+    file delete -force bd
+  }
+  file mkdir bd
+
+  set bd_tcl [open "bd/bd.tcl" w]
 
   puts $bd_tcl "# SCRIPT AUTO-GENERATED AT BUILD, DO NOT MODIFY!"
   puts $bd_tcl "proc init {cellpath otherInfo} {"
@@ -406,6 +394,15 @@ proc adi_auto_fill_bd_tcl {} {
   puts $bd_tcl "}"
   puts $bd_tcl ""
   close $bd_tcl
+
+  set proj_fileset [get_filesets sources_1]
+  add_files -norecurse -scan_for_includes -fileset $proj_fileset "bd/bd.tcl"
+
+  set local_mk [open "temporary_case_dependencies.mk" w]
+  seek $local_mk 0 start
+  puts $local_mk "CLEAN_TARGET += bd"
+  puts $local_mk "CLEAN_TARGET += temporary_case_dependencies.mk"
+  close $local_mk
 }
 
 proc adi_add_auto_fpga_spec_params {} {
diff --git a/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl b/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl
index e22b7aeeb..e34c481ad 100644
--- a/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl
+++ b/library/xilinx/axi_adxcvr/axi_adxcvr_ip.tcl
@@ -3,8 +3,6 @@
 source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create axi_adxcvr
 adi_ip_files axi_adxcvr [list \
   "$ad_hdl_dir/library/common/up_axi.v" \
@@ -14,13 +12,12 @@ adi_ip_files axi_adxcvr [list \
   "axi_adxcvr_up.v" \
   "axi_adxcvr_mdrp.v" \
   "axi_adxcvr_mstatus.v" \
-  "axi_adxcvr.v" \
-  "bd/bd.tcl" ]
+  "axi_adxcvr.v" ]
 
 adi_ip_properties axi_adxcvr
 adi_ip_infer_mm_interfaces axi_adxcvr
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd axi_adxcvr "bd/bd.tcl"
 
 set_property driver_value 0 [ipx::get_ports -filter "direction==in" -of_objects [ipx::current_core]]
diff --git a/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl b/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl
index 6890c5e09..11a1bfb7f 100644
--- a/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl
+++ b/library/xilinx/util_adxcvr/util_adxcvr_ip.tcl
@@ -3,8 +3,6 @@
 source ../../scripts/adi_env.tcl
 source $ad_hdl_dir/library/scripts/adi_ip.tcl
 
-adi_init_bd_tcl
-
 adi_ip_create util_adxcvr
 adi_ip_files util_adxcvr [list \
   "$ad_hdl_dir/library/scripts/common_bd.tcl" \
@@ -12,12 +10,11 @@ adi_ip_files util_adxcvr [list \
   "util_adxcvr_constr.xdc" \
   "util_adxcvr_xcm.v" \
   "util_adxcvr_xch.v" \
-  "util_adxcvr.v" \
-  "bd/bd.tcl"]
+  "util_adxcvr.v" ]
 
 adi_ip_properties_lite util_adxcvr
 
-adi_auto_fill_bd_tcl
+adi_init_bd_tcl
 adi_ip_bd util_adxcvr "bd/bd.tcl"
 
 ipx::remove_all_bus_interface [ipx::current_core]