Fix a few issues.

Fixes #5011 and #5002 .
Also, do we still need _singularName() and its singularization?