Fix typos in templates as well