align variable name with that used in template