Change gender/sex to gender/gender_identity

Fixes #16.