Renamed a few of the convenience functions