Reworked all names to be singular nouns