Some function name and typo fixes.