Fix variable renaming issue.