Some changes in the name of variables.