Change generator template to not use named argument 'name'