Fixed Template/Name confusion