Renaming of a few variables.