Updated variable accessors in templates to use @ at front of variable name