Fixed issue with class pluralization