Rename to singular form.
More renaming to singular.