major route and name refactoring