Name reversed on I797/I94 and passport

Hi,

As per passport my surname is blank

Given Name(s): XXXX YYYY

Surname:

My approved I797 and I94 (H4 to H1B) has

I797:

Beneficiary : XXXX YYYY, NO NAME GIVEN

I94:

Family Name: XXXX YYYY

First (Given) Name: NO NAME GIVEN

As you see the Given name/First Name and Surname/Family Name has been reversed on I797/I94 from the passport.

I have heard USCIS does this on purpose in case where first or last name is missing they will keep the first name blank.

When i went to apply for SSN , officer told me this is a issue and my data would be sent to Department of homeland security for verification and it will take around 4 weeks on verification decision.

Would this reversal create a issue in verification and if yes then how do i get this corrected.

Any answers?