Plural to singular refactoring.