Refactoring: renamed a few variables for consistency.