Fix variable renaming