Fix warnings with deprecated functions

This is a pretty straight-forward rename.