FNU Problem in I-94

[npe]

I am facing FNU Issue

Details:-


Passport
Surname - Blank
Given Name - YYYY YYYY

Visa/SSN/US Driving License ( all are Correct)
Last Name - YYYY
Given Name - YYYY

I-94
Recent Entry -
Last Name - FNU
First Name - YYYY YYYY

Previous Entry
Last Name - YYYY
First Name - YYYY


I-797B
Name mentioned as " YYYY YYYY ,No Name Given'

Shall i go to CBP office and get FNU Fixed in I-94?
Should details in I-94 match Visa (this is how i am hoping to explain my case at CBP Office?

Long Term Solution (thinking about it):-I am also considering option to get my Name fixed in Passport.. will this impact Visa/SSN/Driving License also (as they are already correct)?