Refactor: Field rename