Update to use proper UAID/CHIDs