Minor variable name refactoring