fix routes and names