Refactor variable names