Change route names

Two tests broken for unresolved reasons.
Merge branch 'master' into develop