Renamed and moved constants.