Update old references that are no longer valid