Changed function names to match file names.