Fixed inconsistent template naming