[PATCH 06/22] uuid: rename uuid types