Renaming some constants left over from migration from RESTClient