Updated most of the template title names so we can draw good metrics on usage.