Adapt to API renames