Adjust used endpoints to match the REST standard