Consolidate genders

Also fixes a few names' spacing and things, as well as adding 3 characters to fix some things (would've been better spread over multiple commits but ehh web GitHub is annoying)