Renamed functions to make their context more clear