Updating the api, to remove device* naming stuff