fixed naming on templates