Avoid duplicate name for service and organization