updated templates to make their tagging consistent