Adjusted route names, refactored api