Replace references to omni/city_isp_org. Add deprecation warnings.