some variable renaming