Renamed functions to match changes made in mariuslundgard/help