Fixed some parameter naming inconsistencies