Fixed some old names & typos.