Updated template naming