Replace enumerations with more meaningful names