FNU corrected in Passport, but I-797 with FNU, Any issue on dropbox options


FNU issue with H1B holder.
Current I-797 with First name “FNU” Surname “ABC XYZ”
Old Passport with Given name “ABC XYZ” Surname " "
New Passport with Given name “ABC” Surname “XYZ”
Now planning to visit india and eligible for visa interview waiver program and before that if i get my passport corrected in USA.
So any issue i can face on visa renewal process.
Any suggestion ?