s4: Rename UID_WRAPPER to uid_wrapper.