Removed UUID check

replaced with name check