More work on making all variable names pascal case
Merge pull request #489 from timschofield/develop

More work on making all variable names pascal case