Fixed route names to be more consistent