Not so important. If you think that add a "," after family name, the family name can be put before given name.
I believe your name on H1b approval notice is correct (you did not say it is wrong either), so never detach the I-94 from your H1b approval notice. You should be OK.