More variable renaming.