Removed more old names