Fix @name template warnings