Fixing some typos and sort order for previous conventions.