Update some variable names that are now reserved keywords.
Merge pull request #27 from splewis/reserved-words-fix

Update some variable names that are now reserved keywords.