removed template remarks and adjusted name