Using new template variable naming