Change gender/sex to gender/gender_identity