Use new variables format in templates