Fix parameter name overlap