Give templates more explicit names