Fix argument names to avoid collision