improved pluralization support, nuked some displayName->shortName hacks, will wait for better implementation serverside