MN1 form for child - name mistake in Biometric letter

Hello,

The Home Office is currently processing a MN1 registration application for my 3 years old son. I am doing it through a company called "xyz". I have two problems:

My family name is in two names, but the Home Office made a mistake and took only one. Like for example, if you have "Jacob x y", they took "Jacob x" as first name, and "y" as last name.

I have emailed nationalitybiometrics@homeoffice.gsi.gov.uk a few days ago but so far haven't received a reply (it's also Christmas times so I presume it's going to be slow).

My questions:

1/ Although I have been advised to wait for a reply and a new BRP letter to be re-issued, has anyone taken the risk to enroll the BRP data first and gets the name corrected later? I am fearing the application to be rejected because of late BRP enrollment.

2/ One thing that really puzzles me, is that the immigration company (to which I paid a fairly expensive fee) told me at first "There is not much you can do, Let us wait to see if the name is correct on the citizenship certificate, and write to the HO if the name is wrong". I can't help but thinking that this reaction from the company was not the one I expected: requesting a change after naturalization will obviously be harder than requesting it before, or did I miss something in my understanding of the service provided by those companies? I am feeling like the company is really reluctant to chase up the mistake. I might be wrong, or mistaken, but I thought the whole point of those companies is to help you if something does not go right, no, not only to help with filling the forms? Especially stuff like admin mistakes or so from the Home Office.

I would be extremely disturbing that my 3 years old son and I travel with family names that don't match, try to imagine the questions at the Border, as if things were not already complicated enough...

Any advice about all this, or people who experienced similar issues?

thanks

Noone to help...

anyway I received a new letter