tweaks to the pluralization and conversion from Class to Rest names