Everyone fights for equality by trying to get laws made to specifically protect their own groups. Why not abolish discriminatory wording entirely so all laws apply to all groups? A crime against a man is the same as a crime against a woman. A crime against an African American is the same as a crime against a Hispanic. A crime against a gay couple is the same as a crime against a straight couple.
Eliminate discrimination by generalization. We are all people, and any crime against one person should be equal to any other person regardless of Gender, Race, Religion, or Sexual Orientation. Eliminate the terms from all government documentation, and let equality thrive.