Variable renaming

Source code variable renaming.