Fix problems creating template functions caused by the changes for the new single-name rule

The single-rule changes caused spurious duplicate messages