Merge pull request #1743 from Stevoisiak/variableNamingConsistency Globals.h: Variable naming consistency
