Removed old name references