Rename variables for consistency.
Merge pull request #101 from DouweM/patch-9

Rename variables for consistency.