Changed template naming