When to change the name in Passport once H1B is stamped?

[akshay1680]

Hi,

 

I have only my Given name in the passport (Akshay) and Surname is blank. My actual surname(shetty) was not included in the passport. This happened because my birth certificate has only my first name.

 

However, I got my H1B stamped on my passport with Given name: FNU and Surname: Akshay but haven't travelled yet. After reading various discussions, I now understand the importance of having a surname in my passport. So, should I be changing it before i travel to the US or should i travel as it is and change it once I'm in the US?

 

If I have to change it before I enter the US,

 

How do I change it on my I-797?

How do I change it on the passport?

Will I have to go for stamping again?

 

Any help in deciding is appreciated!