Fix remnants of renaming functions and some typos.