Some more variable renaming.