Fixed variable renaming.