Fix old name references