Change consts to enumerations