Don't pluralize model names not ending with letters

Closes #1703