Refactored GENDER to Gender