Various changes in parameter naming for consistency