Function renaming and deprecation from #517
Merge pull request #538 from garborg/deprecations

Function renaming and deprecation from #517