Minor renaming.
Fix broken pluralization handling.