Add consistent naming for templates