Change route names and nesting