My CoPR shows correct name for both surname and given name. I am no expert but if I were you, I would contact the Detroit office and consult what to do. My guess is if her given name and surname are not matching as shown in the passport, there's room for trouble.
If your CoPR doesn't expire...