Name issue in CIC docs and Passport

[canadaforu]

My passport has only name field and both first and last name are entered as FName LName. Though in PR application I entered it separately, in all CIC docs my first and last name are in family name column & given name is blank in my new BOWP and MR form.

Did anybody encounter this situation? And how to correct this with CIC?

Any advise would be appreciated!!!