Use new name everywhere