Made the parameter naming a bit more consistent.