some more consistency in parameter naming