Renaming variables to have more sense