Change references to global