diff --git a/boards/uniboard2c/designs/unb2c_test/unb2c_test.fpga.yaml b/boards/uniboard2c/designs/unb2c_test/unb2c_test.fpga.yaml
index 0b9e4ee9e907f520e4536c7349178049645881b4..1e647946b173ce0e808a34b2766f9e38e9fb08fe 100644
--- a/boards/uniboard2c/designs/unb2c_test/unb2c_test.fpga.yaml
+++ b/boards/uniboard2c/designs/unb2c_test/unb2c_test.fpga.yaml
@@ -79,22 +79,22 @@ peripherals:
       - { name: g_nof_reg, value: c_nof_streams_eth0_UDP }
       - { name: g_buf_addr_w, value: 8 }
     mm_port_names:
-      - REG_ETH1G_I_BG_CTRL
-      - RAM_ETH1G_I_BG_CTRL  # not used in eth_tester_tx
+      - REG_DIAG_BG_ETH_0
+      - RAM_DIAG_BG_ETH_0  # not used in eth_tester_tx
 
   - peripheral_name: eth_tester_offload_hdr_dat
     peripheral_group: eth0_tx
     number_of_peripherals: c_nof_streams_eth0_UDP
     peripheral_span: ceil_pow2(c_nof_streams_eth0_UDP) * 32 * MM_BUS_SIZE  # number_of_ports = 4, mm_port_span = 32 words
     mm_port_names:
-      - REG_ETH1G_I_HDR_DAT
+      - REG_HDR_DAT_ETH_0
 
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: eth0_tx
     parameter_overrides:
       - { name: g_nof_streams, value: c_nof_streams_eth0_UDP }
     mm_port_names:
-      - REG_ETH1G_I_BSN_MONITOR_V2_TX
+      - REG_BSN_MONITOR_V2_TX_ETH_0
 
   - peripheral_name: dp/dp_strobe_total_count
     peripheral_group: eth0_tx
@@ -104,14 +104,14 @@ peripherals:
       - { name: g_nof_counts, value: 1 }  # actual nof counts, <= g_nof_counts_max = 15
                                           # 0 = nof_sop
     mm_port_names:
-      - REG_ETH1G_I_STROBE_TOTAL_COUNT_TX
+      - REG_STROBE_TOTAL_COUNT_TX_ETH_0
 
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: eth0_rx
     parameter_overrides:
       - { name: g_nof_streams, value: c_nof_streams_eth0_UDP }
     mm_port_names:
-      - REG_ETH1G_I_BSN_MONITOR_V2_RX
+      - REG_BSN_MONITOR_V2_RX_ETH_0
 
   - peripheral_name: dp/dp_strobe_total_count
     peripheral_group: eth0_rx
@@ -121,7 +121,7 @@ peripherals:
       - { name: g_nof_counts, value: 3 }  # actual nof counts, <= g_nof_counts_max = 15
                                           # 0 = nof_sop, 1 = nof_valid, 2 = nof_crc_corrupt
     mm_port_names:
-      - REG_ETH1G_I_STROBE_TOTAL_COUNT_RX
+      - REG_STROBE_TOTAL_COUNT_RX_ETH_0
 
   # 1GbE-II
   - peripheral_name: eth/eth  # eth_stream
@@ -138,18 +138,18 @@ peripherals:
       - { name: g_nof_reg, value: 1 }
       - { name: g_buf_addr_w, value: 8 }
     mm_port_names:
-      - REG_ETH1G_I_BG_CTRL
-      - RAM_ETH1G_I_BG_CTRL  # not used in eth_tester_tx
+      - REG_DIAG_BG_ETH_1
+      - RAM_DIAG_BG_ETH_1  # not used in eth_tester_tx
 
   - peripheral_name: eth_tester_offload_hdr_dat
     peripheral_group: eth1_tx
     mm_port_names:
-      - REG_ETH1G_I_HDR_DAT
+      - REG_HDR_DAT_ETH_1
 
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: eth1_tx
     mm_port_names:
-      - REG_ETH1G_I_BSN_MONITOR_V2_TX
+      - REG_BSN_MONITOR_V2_TX_ETH_1
 
   - peripheral_name: dp/dp_strobe_total_count
     peripheral_group: eth1_tx
@@ -157,12 +157,12 @@ peripherals:
       - { name: g_nof_counts, value: 1 }  # actual nof counts, <= g_nof_counts_max = 15
                                           # 0 = nof_sop
     mm_port_names:
-      - REG_ETH1G_I_STROBE_TOTAL_COUNT_TX
+      - REG_STROBE_TOTAL_COUNT_TX_ETH_1
 
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: eth1_rx
     mm_port_names:
-      - REG_ETH1G_I_BSN_MONITOR_V2_RX
+      - REG_BSN_MONITOR_V2_RX_ETH_1
 
   - peripheral_name: dp/dp_strobe_total_count
     peripheral_group: eth1_rx
@@ -170,7 +170,7 @@ peripherals:
       - { name: g_nof_counts, value: 3 }  # actual nof counts, <= g_nof_counts_max = 15
                                           # 0 = nof_sop, 1 = nof_valid, 2 = nof_crc_corrupt
     mm_port_names:
-      - REG_ETH1G_I_STROBE_TOTAL_COUNT_RX
+      - REG_STROBE_TOTAL_COUNT_RX_ETH_1
 
   # 10GbE
   - peripheral_name: diag/diag_block_gen