[PATCH 06/24] uuid: rename uuid types