Replace old references with new wrapper.