Coding convention; rename some enum constants.