Split out UuidByName from Find