Changed more reference to old name.