cleaned up the global variables' names
Merge pull request #122 from ijancigova/master

cleaned up the global variables' names