Refactor to normalize use uid instead of eid and yid in preparation for raetpeer