Change references to live service