Name change in Indian passport & in B1/2 US visa

In existing Indian passport and US B1/2 visa (still valid for few years) name and surname have wrongly been interchanged. For example if

Given Name :A

Middle name : B

Surname: C

It is written as C AB in both documents.

It should be A B C.

Now it is time to made correction in new passport as old one is expiring. What procedure need to be followed? My e mail address is