Refactor: Name globals consitently with variable-naming style