Updated naming of parameters to be more consistent