Update variables to use @VARIABLE in template

this is to remove deprecation warnings when ever a template is applied.