Revert API route names.
Security fixes minus some v2 changes