Function renaming and deprecation from #517