Added variable renaming.