Refactor: Change variable names