updated names of services
removed references to service->Code