Updated global var names to be more consistent
Merge pull request #15 from faceleg/feature/global-var-names

Feature/global var names