Changed some of the argument names