Variable name refactoring
Merge pull request #450 from codingtwinky/master

Variable name refactoring