Converted variables used in templates to @var format