diff --git a/library/util_cpack/util_cpack_ip.tcl b/library/util_cpack/util_cpack_ip.tcl
index 9820b6842..dc81941ec 100644
--- a/library/util_cpack/util_cpack_ip.tcl
+++ b/library/util_cpack/util_cpack_ip.tcl
@@ -14,47 +14,20 @@ adi_ip_properties_lite util_cpack
 adi_ip_constraints util_cpack [list \
   "util_cpack_constr.xdc" ]
 
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 1}} \
-  [ipx::get_port adc_enable_1 [ipx::current_core]] \
-  [ipx::get_port adc_valid_1 [ipx::current_core]] \
-  [ipx::get_port adc_data_1 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 2}} \
-  [ipx::get_port adc_enable_2 [ipx::current_core]] \
-  [ipx::get_port adc_valid_2 [ipx::current_core]] \
-  [ipx::get_port adc_data_2 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 3}} \
-  [ipx::get_port adc_enable_3 [ipx::current_core]] \
-  [ipx::get_port adc_valid_3 [ipx::current_core]] \
-  [ipx::get_port adc_data_3 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 4}} \
-  [ipx::get_port adc_enable_4 [ipx::current_core]] \
-  [ipx::get_port adc_valid_4 [ipx::current_core]] \
-  [ipx::get_port adc_data_4 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 5}} \
-  [ipx::get_port adc_enable_5 [ipx::current_core]] \
-  [ipx::get_port adc_valid_5 [ipx::current_core]] \
-  [ipx::get_port adc_data_5 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 6}} \
-  [ipx::get_port adc_enable_6 [ipx::current_core]] \
-  [ipx::get_port adc_valid_6 [ipx::current_core]] \
-  [ipx::get_port adc_data_6 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 7}} \
-  [ipx::get_port adc_enable_7 [ipx::current_core]] \
-  [ipx::get_port adc_valid_7 [ipx::current_core]] \
-  [ipx::get_port adc_data_7 [ipx::current_core]] \
-
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 1} \
+  [ipx::get_ports *_1* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 2} \
+  [ipx::get_ports *_2* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 3} \
+  [ipx::get_ports *_3* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 4} \
+  [ipx::get_ports *_4* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 5} \
+  [ipx::get_ports *_5* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 6} \
+  [ipx::get_ports *_6* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 7} \
+  [ipx::get_ports *_7* -of_objects [ipx::current_core]]
 
 ipx::save_core [ipx::current_core]
 
diff --git a/library/util_upack/util_upack_ip.tcl b/library/util_upack/util_upack_ip.tcl
index feb634693..a4a2e74e7 100644
--- a/library/util_upack/util_upack_ip.tcl
+++ b/library/util_upack/util_upack_ip.tcl
@@ -14,54 +14,24 @@ adi_ip_properties_lite util_upack
 adi_ip_constraints util_upack [list \
   "util_upack_constr.xdc" ]
 
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 1}} \
-  [ipx::get_port dac_enable_1 [ipx::current_core]] \
-  [ipx::get_port dac_valid_1 [ipx::current_core]] \
-  [ipx::get_port dac_data_1 [ipx::current_core]] \
-  [ipx::get_port upack_valid_1 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 2}} \
-  [ipx::get_port dac_enable_2 [ipx::current_core]] \
-  [ipx::get_port dac_valid_2 [ipx::current_core]] \
-  [ipx::get_port dac_data_2 [ipx::current_core]] \
-  [ipx::get_port upack_valid_2 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 3}} \
-  [ipx::get_port dac_enable_3 [ipx::current_core]] \
-  [ipx::get_port dac_valid_3 [ipx::current_core]] \
-  [ipx::get_port dac_data_3 [ipx::current_core]] \
-  [ipx::get_port upack_valid_3 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 4}} \
-  [ipx::get_port dac_enable_4 [ipx::current_core]] \
-  [ipx::get_port dac_valid_4 [ipx::current_core]] \
-  [ipx::get_port dac_data_4 [ipx::current_core]] \
-  [ipx::get_port upack_valid_4 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 5}} \
-  [ipx::get_port dac_enable_5 [ipx::current_core]] \
-  [ipx::get_port dac_valid_5 [ipx::current_core]] \
-  [ipx::get_port dac_data_5 [ipx::current_core]] \
-  [ipx::get_port upack_valid_5 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 6}} \
-  [ipx::get_port dac_enable_6 [ipx::current_core]] \
-  [ipx::get_port dac_valid_6 [ipx::current_core]] \
-  [ipx::get_port dac_data_6 [ipx::current_core]] \
-  [ipx::get_port upack_valid_6 [ipx::current_core]] \
-
-
-set_property -dict {driver_value {0} enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 7}} \
-  [ipx::get_port dac_enable_7 [ipx::current_core]] \
-  [ipx::get_port dac_valid_7 [ipx::current_core]] \
-  [ipx::get_port dac_data_7 [ipx::current_core]] \
-  [ipx::get_port upack_valid_7 [ipx::current_core]] \
-
+set_property driver_value 0 [ipx::get_ports *dac_enable* -of_objects [ipx::current_core]]
+set_property driver_value 0 [ipx::get_ports *dac_valid* -of_objects [ipx::current_core]]
+set_property driver_value 0 [ipx::get_ports *dac_data* -of_objects [ipx::current_core]]
+set_property driver_value 0 [ipx::get_ports *dma_xfer_in* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 1} \
+  [ipx::get_ports *_1* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 2} \
+  [ipx::get_ports *_2* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 3} \
+  [ipx::get_ports *_3* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 4} \
+  [ipx::get_ports *_4* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 5} \
+  [ipx::get_ports *_5* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 6} \
+  [ipx::get_ports *_6* -of_objects [ipx::current_core]]
+set_property enablement_dependency {spirit:decode(id('MODELPARAM_VALUE.CH_CNT')) > 7} \
+  [ipx::get_ports *_7* -of_objects [ipx::current_core]]
 
 ipx::save_core [ipx::current_core]