Refactor: rename non-const variable