Renamed a few constants

Also I hate Aaron Weiss