Updated templates to use user variables.
Fixed typo.