fixed wrong controllers and service names