diff --git a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/mmm_lofar2_unb2b_beamformer.vhd b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/mmm_lofar2_unb2b_beamformer.vhd
index c116e37ee89765d76e53d2a79edbeae0ae33f75c..6071cc43dd969c7de9059ba46869e270a5284ce3 100644
--- a/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/mmm_lofar2_unb2b_beamformer.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_beamformer/src/vhdl/mmm_lofar2_unb2b_beamformer.vhd
@@ -656,7 +656,7 @@ BEGIN
 
       reg_hdr_dat_clk_export                    => OPEN,
       reg_hdr_dat_reset_export                  => OPEN,
-      reg_hdr_dat_address_export                => reg_hdr_dat_mosi.address(c_sdp_reg_hdr_dat_addr_w-1 DOWNTO 0),
+      reg_hdr_dat_address_export                => reg_hdr_dat_mosi.address(c_sdp_reg_bf_hdr_dat_addr_w-1 DOWNTO 0),
       reg_hdr_dat_write_export                  => reg_hdr_dat_mosi.wr,
       reg_hdr_dat_writedata_export              => reg_hdr_dat_mosi.wrdata(c_word_w-1 DOWNTO 0), 
       reg_hdr_dat_read_export                   => reg_hdr_dat_mosi.rd,
diff --git a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd
index c97efa9fc2080f8c071a0f87e19ad6b4c7e53b70..c5d6f18976b64a2f8f22cca4e0f4b4adb9c28c47 100644
--- a/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2b_sdp_station/src/vhdl/mmm_lofar2_unb2b_sdp_station.vhd
@@ -719,7 +719,7 @@ BEGIN
 
       reg_hdr_dat_clk_export                    => OPEN,
       reg_hdr_dat_reset_export                  => OPEN,
-      reg_hdr_dat_address_export                => reg_hdr_dat_mosi.address(c_sdp_reg_hdr_dat_addr_w-1 DOWNTO 0),
+      reg_hdr_dat_address_export                => reg_hdr_dat_mosi.address(c_sdp_reg_bf_hdr_dat_addr_w-1 DOWNTO 0),
       reg_hdr_dat_write_export                  => reg_hdr_dat_mosi.wr,
       reg_hdr_dat_writedata_export              => reg_hdr_dat_mosi.wrdata(c_word_w-1 DOWNTO 0), 
       reg_hdr_dat_read_export                   => reg_hdr_dat_mosi.rd,
diff --git a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd
index d35eb3c749dd6c451f79abb9fce02821fc1618d9..62cbff0cf3f1f2fac7c8d1701e83263b280b092a 100644
--- a/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd
+++ b/applications/lofar2/designs/lofar2_unb2c_sdp_station/src/vhdl/mmm_lofar2_unb2c_sdp_station.vhd
@@ -690,7 +690,7 @@ BEGIN
 
       reg_hdr_dat_clk_export                    => OPEN,
       reg_hdr_dat_reset_export                  => OPEN,
-      reg_hdr_dat_address_export                => reg_hdr_dat_mosi.address(c_sdp_reg_hdr_dat_addr_w-1 DOWNTO 0),
+      reg_hdr_dat_address_export                => reg_hdr_dat_mosi.address(c_sdp_reg_bf_hdr_dat_addr_w-1 DOWNTO 0),
       reg_hdr_dat_write_export                  => reg_hdr_dat_mosi.wr,
       reg_hdr_dat_writedata_export              => reg_hdr_dat_mosi.wrdata(c_word_w-1 DOWNTO 0), 
       reg_hdr_dat_read_export                   => reg_hdr_dat_mosi.rd,