Refactored to remove getServiceName() methods from services. Service name defined in config should be enough.