Change name to remove Template