Change the routes parameters for more consistency