diff --git a/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu13p.xdc b/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu13p.xdc
index 0c265cd..8228ed6 100644
--- a/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu13p.xdc
+++ b/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu13p.xdc
@@ -1,11 +1,11 @@
 
 # CMACs
-set_property LOC CMACE4_X0Y10 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[0].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y9 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[1].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y8 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[2].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y7 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[3].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y6 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[4].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y5 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[5].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y4 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[6].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y3 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[7].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y2 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[8].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y10 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[0].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y9 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[1].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y8 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[2].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y7 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[3].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y6 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[4].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y5 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[5].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y4 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[6].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y3 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[7].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y2 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[8].mac.* && REF_NAME==CMACE4}]
diff --git a/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu9p.xdc b/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu9p.xdc
index 6d9aae6..f9a7986 100644
--- a/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu9p.xdc
+++ b/src/eth/example/HTG9200/fpga/syn/eth_cmac_vu9p.xdc
@@ -1,11 +1,11 @@
 
 # CMACs
-set_property LOC CMACE4_X0Y8 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[0].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y7 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[1].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y6 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[2].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y5 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[3].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y4 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[4].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y3 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[5].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y2 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[6].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y1 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[7].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y0 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[8].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y8 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[0].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y7 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[1].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y6 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[2].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y5 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[3].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y4 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[4].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y3 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[5].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y2 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[6].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y1 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[7].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y0 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[8].mac.* && REF_NAME==CMACE4}]
diff --git a/src/eth/example/RK_XCKU5P_F/fpga/syn/eth_cmac.xdc b/src/eth/example/RK_XCKU5P_F/fpga/syn/eth_cmac.xdc
index 7463998..13e1e20 100644
--- a/src/eth/example/RK_XCKU5P_F/fpga/syn/eth_cmac.xdc
+++ b/src/eth/example/RK_XCKU5P_F/fpga/syn/eth_cmac.xdc
@@ -1,3 +1,3 @@
 
 # CMACs
-set_property LOC CMACE4_X0Y0 [get_cells -hierarchical -filter {NAME =~ core_inst/mac.qsfp_mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y0 [get_cells -hierarchical -filter {NAME =~ core_inst/mac.* && REF_NAME==CMACE4}]
diff --git a/src/eth/example/VCU108/fpga/syn/eth_cmac.xdc b/src/eth/example/VCU108/fpga/syn/eth_cmac.xdc
index fdc0121..92d8946 100644
--- a/src/eth/example/VCU108/fpga/syn/eth_cmac.xdc
+++ b/src/eth/example/VCU108/fpga/syn/eth_cmac.xdc
@@ -1,3 +1,3 @@
 
 # CMACs
-set_property LOC CMAC_SITE_X0Y1 [get_cells -hierarchical -filter {NAME =~ core_inst/mac.qsfp_mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMAC}]
+set_property LOC CMAC_SITE_X0Y1 [get_cells -hierarchical -filter {NAME =~ core_inst/mac.* && REF_NAME==CMAC}]
diff --git a/src/eth/example/VCU118/fpga/syn/eth_cmac.xdc b/src/eth/example/VCU118/fpga/syn/eth_cmac.xdc
index ff42e5d..5f0c36e 100644
--- a/src/eth/example/VCU118/fpga/syn/eth_cmac.xdc
+++ b/src/eth/example/VCU118/fpga/syn/eth_cmac.xdc
@@ -1,4 +1,4 @@
 
 # CMACs
-set_property LOC CMACE4_X0Y7 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[0].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
-set_property LOC CMACE4_X0Y8 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[1].mac.mac_inst/cmac.cmac_inst/inst/i_taxi_eth_mac_100g_us_cmac_top/* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y7 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[0].mac.* && REF_NAME==CMACE4}]
+set_property LOC CMACE4_X0Y8 [get_cells -hierarchical -filter {NAME =~ core_inst/gt_quad[1].mac.* && REF_NAME==CMACE4}]