Name Change on Passport

[desperadoravi]

My Indian Passport is about to expire at the beginning of the next year. I have complications with my name that I hope to get resolved with the new passport. Currently this is how my name is written in the passport:
Last Name: John XXX
First: YYY Doe

My American visas (F1, H1-B) and subsequent GC application was done under the first name John, middle name XXX, and last name YYY Doe. I just submitted my green card application packet couple of weeks ago (I-130, I-485, I-765, I-131) with the name as shown in previous American visas. I did not have time to get name corrected as I was nearing end of 6 year tenure on H1-B.

When I renew my Indian passport I hope to get the name corrected to reflect the correct name which is
First Name: John
Middle Name: XXX YYY
Last Name: Doe

I have two questions regarding this change:

1. When I get my Indian passport renewed at consulate in the US, will they be able to fix the name? All my Indian documents other than the passport show my name as John.X.Y (birth certificate etc)

2. If I do get the passport issued with the name displaying correctly, what do I need to do to reflect this change in the green card applications I have submitted.

Thanks

 

[desperadoravi]

Update: I received a response to my query at the Indian consulate in NY and according to the email I received In case of change of name by splitting the name as given name and surname, all I need to provide is an Affidavit on change of name. So it looks like I can definitely get this done without much of a hassle at the consulate.

The open question is now what do i do about the GC application. I can wait till the end of the year to get my name changed on my passport, and hope I have my GC by then. If I do i can then apply for a name change on the GC. However if I do not get my GC by then, what are my options?