Update routing conventions to use singular helpers