Fix a few typos.
Changes based on simons feedback. Largely to do with consistency of names.
A few diagram changes for consistency.