Make templates stored consistently