Keep variable naming consistent
Merge pull request #223 from driesvints/patch-1

Keep variable naming consistent