Fix underscores in arg names