[Templating] Rename  to a less common name