Renamed functions appropriately.