fixing issues with parameter naming