Forced all the identifier names to be singular.