Renames and deprecations, in prep for increased sugar