Making hacks a little less hacky.
Renamed some constants for better consistancy.