Changed variables' name to match with the naming practice of the rest of the code
Merge pull request #6 from simondesloges/master

Changed variables' name to match with the naming practice of the rest of...