FIX: Constant names

This fixes some constant names, and hopefully speeds up AppVeyor a little bit -- though it might not be enough...
Yeah, I'm working on getting an updated set of constants since some are missing from the header version I have.