[Internals] Fix parameter names: hyphen/underscore
Merge pull request #3092 from bicpi/fix_parameter_names

[Internals] Fix parameter names regarding hyphen/underscore