Spelling etc

Changes to code and variable assignment names etc.