(fix) Update for renames and deprecations.