Fix #380 and rename a parameter.