I actually thought about this a lot since I posted and realized that, if there's a squished name generally assumed to be 'correct' among the fandom, then I put them in that order, unsquished. Otherwise, girl first. I really can't stand squishy names for some reason, though.