Fix an issue where duplicate argument names were being created