Some variable renaming.