Renamed API just a bit.