Fix template names in text and variable name in heading