Renamed functions to match a better naming scheme