Refactor variable name fix