Fixed problem with service name