How to prevent gender issues in your child

Actually, that should read, "How NOT to prevent gender issues in your child" I have nearly two and a half years practice of saying to my baby, "Oh good girl!" as she accomplishes one sort of milestone or another. My brain is programmed to say it almost automatically. So, poor Riley, usually when he does something well, the words "Oh good girl!" tend to just spill out. Then I apologise, and say, "Good boy!" (I can now understand my grandmother, who sometimes rattles off half a dozen of my cousin's or aunt's names before settling on mine. It DOES get confusing!) To add to this, Riley wears some of Keira's hand me down clothes! Mind, I used to dress her somewhat of a tomboy. So, when he looks cute in his rugby guernsey, I say "That was Keira's!". People look at me strangely.... Oh, and then there's this: I have to stress, his FATHER modelled that shot. Good Lord, what kind of house is this?!