diff --git a/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml
index 373f67c336f362db51b0f2c07bb4ad4119d930d5..931256ec79ceeb609fb5b78dc9e34fe1ede25322 100644
--- a/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_adc/lofar2_unb2b_adc.fpga.yaml
@@ -18,7 +18,7 @@ peripherals:
 
   - peripheral_name: unb2b_board/wdi
     mm_port_names:
-      - PIO_WDI
+      - REG_WDI
 
   - peripheral_name: unb2b_board/unb2_fpga_sens
     mm_port_names:
diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
index 674f5ceb675cef28356a62c13099580c279a810f..14218e8d3d3e96e1716b2418c849465390c4b3ff 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/lofar2_unb2b_beamformer.fpga.yaml
@@ -45,7 +45,7 @@ peripherals:
 
   - peripheral_name: unb2b_board/wdi
     mm_port_names:
-      - PIO_WDI
+      - REG_WDI
 
   - peripheral_name: unb2b_board/unb2_fpga_sens
     mm_port_names:
diff --git a/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml
index 8408d2456e30458687ea5369c9360089f5b331c0..c7da0c5726d09d2034d4d111993bccdf20b3de50 100644
--- a/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_filterbank/lofar2_unb2b_filterbank.fpga.yaml
@@ -18,7 +18,7 @@ peripherals:
 
   - peripheral_name: unb2b_board/wdi
     mm_port_names:
-      - PIO_WDI
+      - REG_WDI
 
   - peripheral_name: unb2b_board/unb2_fpga_sens
     mm_port_names:
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
index 11c42ec5f03a957940d2fe69532d4d3f934c402e..bc503a623c5354fe8f628693f00d45c5a6bb32c5 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/lofar2_unb2b_sdp_station.fpga.yaml
@@ -45,7 +45,7 @@ peripherals:
 
   - peripheral_name: unb2b_board/wdi
     mm_port_names:
-      - PIO_WDI
+      - REG_WDI
 
   - peripheral_name: unb2b_board/unb2_fpga_sens
     mm_port_names:
diff --git a/boards/uniboard2b/designs/unb2b_minimal/unb2b_minimal.fpga.yaml b/boards/uniboard2b/designs/unb2b_minimal/unb2b_minimal.fpga.yaml
index 40f9191902718876c4770eddae1437b8cc66f0fe..930c532f171f7c58d85b39ad34039a10abc5c3ef 100644
--- a/boards/uniboard2b/designs/unb2b_minimal/unb2b_minimal.fpga.yaml
+++ b/boards/uniboard2b/designs/unb2b_minimal/unb2b_minimal.fpga.yaml
@@ -18,7 +18,7 @@ peripherals:
 
   - peripheral_name: unb2b_board/wdi
     mm_port_names:
-      - PIO_WDI
+      - REG_WDI
 
   - peripheral_name: unb2b_board/unb2_fpga_sens
     mm_port_names: