Refactoring of variables to bring in line with code style & conventions.
No functional changes