Update to new API names.