Due to a mistake I did while applying for passport[INDIA], the surname section in my passport is empty and given name section has "AA BB". My name in university application and in other places like GRE/TOEFL is in the form surname "BB" and first name "AA". I gave the name similarly in US Visa application [F1]. But the concerned officer at Visa Application Center rightly told me that they go by the name in passport and surname is mandatory to issue US Visa. She suggested me to make a correction to the name in visa application as surname "AA BB" and first name "FNU" [First Name Unavailable]. So if my visa is approved it will have my name as AA BB, FNU.
How do I change my name in a passport and US visa from AA BB, FNU, to my actual name BB,AA before going to the USA?