Rename some variables for consistency
Merge pull request #4 from vladimir-ch/rename-variables

Rename some variables for consistency