more variable name refactoring