diff --git a/src/uuid/uuid.c b/src/uuid/uuid.c
index 33ca9bf..4c1f0a5 100644
--- a/src/uuid/uuid.c
+++ b/src/uuid/uuid.c
@@ -16,9 +16,9 @@ struct uuid4 {
 };
 
 wapp_intern UUID4 generate_uuid4(void);
-wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, UUID *uuid);
+wapp_intern void  uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid);
 
-UUID *wapp_uuid_init_uuid4(UUID *uuid) {
+WUUID *wapp_uuid_init_uuid4(WUUID *uuid) {
   wapp_debug_assert(uuid != NULL, "`uuid` should not be NULL");
 
   UUID4 uuid4 = generate_uuid4();
@@ -47,12 +47,12 @@ wapp_intern UUID4 generate_uuid4(void) {
   return uuid;
 }
 
-wapp_intern void uuid4_to_uuid(const UUID4* uuid4, UUID *uuid) {
-  u64 grp1 = uuid4->high >> 32;
-  u64 grp2 = (uuid4->high << 32) >> 48;
-  u64 grp3 = (uuid4->high << 48) >> 48;
-  u64 grp4 = uuid4->low >> 48;
-  u64 grp5 = (uuid4->low << 16) >> 16;
+wapp_intern void uuid4_to_uuid(const UUID4* uuid4, WUUID *uuid) {
+  u64 group1 = uuid4->high >> 32;
+  u64 group2 = (uuid4->high << 32) >> 48;
+  u64 group3 = (uuid4->high << 48) >> 48;
+  u64 group4 = uuid4->low >> 48;
+  u64 group5 = (uuid4->low << 16) >> 16;
 
-  wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, grp1, grp2, grp3, grp4, grp5);
+  wapp_str8_format(&(uuid->uuid), UUID_STR_FORMAT, group1, group2, group3, group4, group5);
 }
diff --git a/src/uuid/uuid.h b/src/uuid/uuid.h
index 290a462..b110649 100644
--- a/src/uuid/uuid.h
+++ b/src/uuid/uuid.h
@@ -15,8 +15,8 @@ BEGIN_C_LINKAGE
 #define WAPP_UUID_SPEC WAPP_STR8_SPEC
 #define wapp_uuid_varg(UUID) wapp_str8_varg((UUID).uuid)
 
-typedef struct uuid UUID;
-struct uuid {
+typedef struct wapp_uuid WUUID;
+struct wapp_uuid {
   Str8 uuid;
 };
 
@@ -28,7 +28,7 @@ struct uuid {
 
 // Just returns the same pointer that was passed in with the UUID initialised.
 // Fails when passed a NULL pointer.
-UUID *wapp_uuid_init_uuid4(UUID *uuid);
+WUUID *wapp_uuid_init_uuid4(WUUID *uuid);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE