Fix the references to Service.