FIX: Constant names

This fixes some constant names, and hopefully speeds up AppVeyor a little bit -- though it might not be enough...