Fix case insensitivity issue with UUID