More variable renaming