Fix: wrong service names