Fix naming of enum values to convention [take 2]