Improve singular form of enum names