Renamed public functions. These feel more final.