Refactor: rename vars