fixed typos

After fixing template names for 6.2.x, some typos were found. Bringing over typo changes to 6.1.x (template names only changed on 6.2.x).