Update to new names of the API