Fixed some name changing bugs