Merge #10029: Fix parameter naming inconsistencies between .h and .cpp files