Rename a few method arguments, to avoid trailing underscores in method arguments

According to the Dune style rules, names with trailing underscores are reserved
for class data members.

Since the names of method parameters are not part of the API, they can be changed
without prior warning or deprecation period.