Some changes in parameters' names