changed the template names so they are consistant