#70 use singular names for enums