Issue #24: variable rename