Renamed typedef enums. Type names changed from plural to singular.