Regarding passport renewal with correction

[SSA]

Hello,

Below are the my immigration details,

 

Passport 

Given Name -  XXX YYY ZZZ (Full Name)

Last Name- (Blank)

Date of Expiry – 29 June 2018

 

Visa

Given Name- FNU

Last Name – XXX YYY ZZZ (Swapped the Given & Last name at time of visa stamping)

Expiration Date – 5 Aug 2018

 

Latest I94 (As per visa stamping)

Given Name- FNU

Last Name – XXX YYY ZZZ

Admit until – 29 June 2018

 

I797B 

Valid from – 1 Oct 2015 to 5 Aug 2018

My petition copy has correct name.

 

I am planning to split the my full name into Given name (XXX YYY ) & Last Name (ZZZ) provision given by Indian embassy. Can you please clarify the following doubts before going to apply for passport split process,

1)  Do we need to file amendment for petition (I797B) once the passport get fix

2)  Do I need to go for stamping

3) Are there anything i need to do after passport get fix

 

Your help would be greatly appreciated.