Changed Template namespace