Renamed functions to match others