Moving sections around, renaming
Fixing spelling