CONN-418: Fixed the service name issue