Renamed and re-organized some constants for clarity.