changed naming convention on templates