fixed broken claims logic, switched from deprecated ownerName field to claimOwnerField in appropriate locations.