Renamed functions to match file names