diff --git a/library/common/ad_axi_ip_constr.sdc b/library/common/ad_axi_ip_constr.sdc
index d2fae5ae9..661ffac0c 100644
--- a/library/common/ad_axi_ip_constr.sdc
+++ b/library/common/ad_axi_ip_constr.sdc
@@ -1,13 +1,13 @@
 
-set_false_path -from [get_registers *up_xfer_toggle*]   -to [get_registers *d_xfer_state*]
-set_false_path -from [get_registers *up_xfer_toggle*]   -to [get_registers *d_xfer_toggle*]
-set_false_path -from [get_registers *up_count_toggle*]  -to [get_registers *d_count_toggle*]
-set_false_path -from [get_registers *d_xfer_toggle*]    -to [get_registers *up_xfer_state*]
-set_false_path -from [get_registers *d_xfer_toggle*]    -to [get_registers *up_xfer_toggle*]
-set_false_path -from [get_registers *d_count_toggle*]   -to [get_registers *up_count_toggle*]
-set_false_path -from [get_registers *preset*]           -to [get_registers *rst*]
- 
-set_max_delay -from [get_registers *up_xfer_data*]  -to [get_registers *d_data_cntrl*]     8.0
-set_max_delay -from [get_registers *d_xfer_data*]   -to [get_registers *up_data_status*]  20.0
-set_max_delay -from [get_registers *d_count_hold*]  -to [get_registers *up_d_count*]      20.0
+set_false_path  -from [get_registers *up_xfer_cntrl:i_*_xfer_cntrl|d_xfer_toggle*]      -to [get_registers *up_xfer_cntrl:i_*_xfer_cntrl|up_xfer_state_m1*]
+set_false_path  -from [get_registers *up_xfer_cntrl:i_*_xfer_cntrl|up_xfer_toggle*]     -to [get_registers *up_xfer_cntrl:i_*_xfer_cntrl|d_xfer_toggle_m1*]
+set_false_path  -from [get_registers *up_xfer_cntrl:i_*_xfer_cntrl|up_xfer_data*]       -to [get_registers *up_xfer_cntrl:i_*_xfer_cntrl|d_data_cntrl*]
+
+set_false_path  -from [get_registers *up_xfer_status:i_*_xfer_status|up_xfer_toggle*]   -to [get_registers *up_xfer_status:i_*_xfer_status|d_xfer_state_m1*]
+set_false_path  -from [get_registers *up_xfer_status:i_*_xfer_status|d_xfer_toggle*]    -to [get_registers *up_xfer_status:i_*_xfer_status|up_xfer_toggle_m1*]
+set_false_path  -from [get_registers *up_xfer_status:i_*_xfer_status|d_xfer_data*]      -to [get_registers *up_xfer_status:i_*_xfer_status|up_data_status*] 
+
+set_false_path  -from [get_registers *up_clock_mon:i_*_clock_mon|d_count_toggle*]       -to [get_registers *up_clock_mon:i_*_clock_mon|up_count_toggle_m1*]
+set_false_path  -from [get_registers *up_clock_mon:i_*_clock_mon|d_count_hold*]         -to [get_registers *up_clock_mon:i_*_clock_mon|up_d_count*]
+set_false_path  -from [get_registers *up_clock_mon:i_*_clock_mon|up_count_toggle*]      -to [get_registers *up_clock_mon:i_*_clock_mon|d_count_toggle_m1*]