changed names of templates too