Small update in the service client to check long names