Name bifurcation - British passport application

Hello,

I've received my naturalisation certificate and have applied for British passport. In the process of sending supporting documents. I have also done the application for surrender of Indian passport, yet to surrender it - as it needs a copy of foreign passport to be sent along.

On my Indian passport, my given name (first name) has both my first name and last name while my surname (last name) is left blank.

First name: XY
Last name:

In order to correct this on the British passport and have my first name and last name reflected correctly, I am planning to send the following, along with a cover letter explaining this:

• Naturalisation certificate (XY)
• Application form for surrender of Indian passport (XY)
• Indian Passport (copy of relevant pages) [First name: XY, Surname: ]
• Unenrolled deed poll

Please can you advise if this would be sufficient?
Can I draft the unenrolled deed poll for name change (correction) myself, along with 2 witnesses as mentioned here: https://www.gov.uk/change-name-deed-pol ... -deed-poll

Any prior experiences and success stories, please share.
Thank you very much for your advice.

Another question is that I have the following on my UK driving license, old BRPs and the latest ILR:
First name:
Last name: XY
[Somehow this error happened when I applied for my first BRP, and then it got carried over].

Should I include this in the unenrolled deed poll too?
I haven't mentioned any previous names in my British Passport Application form - hope that wont be an issue?
This is name correction, rather than name change, so I guess they'd understand?

What you are suggesting to submit seems reasonable to me.