Fixing up templates so has more informative titles