Cleanup references to old name