Merge "Update for colliding names in arguments and results."