Sometimes its really complicated isnt it? I would suggest phone them. In my case i use my surname when i was single as my middle name here
James is using my husbands surname not mine in her passport but then again he was born here it makes thing easier for them to understand. Ohh next for John you know what im fed up with all this paper thingsnevermind it will end soon
Hope you will get it sorted.