Merge "Refactor uids to user ids where appropriate"