Minor variable renaming