Change routes to use singular nouns