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 03dbe0e4275428f130989cd2766888fee4706020..0304bd91cebf313de4c698550e5dc4ad15482c6f 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
@@ -270,28 +270,28 @@ peripherals:
     parameter_overrides:
       - { name: g_nof_streams, value: c_P_sq }
     mm_port_names:
-      - REG_BSN_ALIGN
+      - REG_BSN_ALIGN_V2
   
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: bsn_align_input
     parameter_overrides:
       - { name: g_nof_streams, value: c_P_sq }
     mm_port_names:
-      - REG_BSN_MONITOR_V2_BSN_ALIGN_INPUT
+      - REG_BSN_MONITOR_V2_BSN_ALIGN_V2_INPUT
   
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: bsn_align_output
     parameter_overrides:
       - { name: g_nof_streams, value: 1 }
     mm_port_names:
-      - REG_BSN_MONITOR_V2_BSN_ALIGN_OUTPUT
+      - REG_BSN_MONITOR_V2_BSN_ALIGN_V2_OUTPUT
   
   - peripheral_name: dp/dp_bsn_monitor_v2
     peripheral_group: xst_udp
     parameter_overrides:
       - { name: g_nof_streams, value: 1 }
     mm_port_names:
-      - REG_XST_UDP_MONITOR
+      - REG_BSN_MONITOR_V2_XST_OFFLOAD
   
   - peripheral_name: ring/ring_lane_info
     peripheral_group: xsub
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
index 194c7142c9ace693e2e0b8c2741754e230c6743d..9d8f88314e6a10f0605469342c88327c05d6e671 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/lofar2_unb2b_sdp_station.vhd
@@ -713,10 +713,10 @@ BEGIN
     reg_bsn_sync_scheduler_xsub_miso             => reg_bsn_sync_scheduler_xsub_miso,
     reg_bsn_align_v2_copi                        => reg_bsn_align_v2_copi, 
     reg_bsn_align_v2_cipo                        => reg_bsn_align_v2_cipo, 
-    reg_bsn_monitor_v2_bsn_align_v2_input_copi   => reg_bsn_monitor_v2_bsn_align_input_copi, 
-    reg_bsn_monitor_v2_bsn_align_v2_input_cipo   => reg_bsn_monitor_v2_bsn_align_input_cipo, 
-    reg_bsn_monitor_v2_bsn_align_v2_output_copi  => reg_bsn_monitor_v2_bsn_align_output_copi, 
-    reg_bsn_monitor_v2_bsn_align_v2_output_cipo  => reg_bsn_monitor_v2_bsn_align_output_cipo, 
+    reg_bsn_monitor_v2_bsn_align_v2_input_copi   => reg_bsn_monitor_v2_bsn_align_v2_input_copi, 
+    reg_bsn_monitor_v2_bsn_align_v2_input_cipo   => reg_bsn_monitor_v2_bsn_align_v2_input_cipo, 
+    reg_bsn_monitor_v2_bsn_align_v2_output_copi  => reg_bsn_monitor_v2_bsn_align_v2_output_copi, 
+    reg_bsn_monitor_v2_bsn_align_v2_output_cipo  => reg_bsn_monitor_v2_bsn_align_v2_output_cipo, 
     reg_bsn_monitor_v2_xst_offload_copi          => reg_bsn_monitor_v2_xst_offload_copi, 
     reg_bsn_monitor_v2_xst_offload_cipo          => reg_bsn_monitor_v2_xst_offload_cipo, 
     reg_ring_lane_info_xst_copi                  => reg_ring_lane_info_xst_copi,