Some typos and renames.