diff --git a/assets/objects/gameplay_keep/arrow_skel.h b/assets/objects/gameplay_keep/arrow_skel.h
index 268c1cf559..f695bffaf6 100644
--- a/assets/objects/gameplay_keep/arrow_skel.h
+++ b/assets/objects/gameplay_keep/arrow_skel.h
@@ -19,14 +19,14 @@ extern LodLimb gArrowSkelLimb_1;
 extern LodLimb gArrowSkelLimb_2;
 extern LodLimb gArrowSkelLimb_3;
 extern void* gArrowLimbs[];
-typedef enum gArrowSkelLimb {
+typedef enum ArrowSkelLimb {
     /*  0 */ ARROW_LIMB_NONE,
     /*  1 */ ARROW_LIMB_0,
     /*  2 */ ARROW_LIMB_1,
     /*  3 */ ARROW_LIMB_2,
     /*  4 */ ARROW_LIMB_3,
     /*  5 */ ARROW_LIMB_MAX
-} gArrowSkelLimb;
+} ArrowSkelLimb;
 extern SkeletonHeader gArrowSkel;
 
 #endif
diff --git a/assets/objects/gameplay_keep/door.h b/assets/objects/gameplay_keep/door.h
index 5d7477a848..c41c9ee2b6 100644
--- a/assets/objects/gameplay_keep/door.h
+++ b/assets/objects/gameplay_keep/door.h
@@ -19,14 +19,14 @@ extern StandardLimb gDoorSkelLimb_1;
 extern StandardLimb gDoorSkelLimb_2;
 extern StandardLimb gDoorSkelLimb_3;
 extern void* gDoorLimbs[];
-typedef enum gDoorSkelLimb {
+typedef enum DoorSkelLimb {
     /*  0 */ DOOR_LIMB_NONE,
     /*  1 */ DOOR_LIMB_0,
     /*  2 */ DOOR_LIMB_1,
     /*  3 */ DOOR_LIMB_2,
     /*  4 */ DOOR_LIMB_3,
     /*  5 */ DOOR_LIMB_MAX
-} gDoorSkelLimb;
+} DoorSkelLimb;
 extern SkeletonHeader gDoorSkel;
 
 #endif
diff --git a/assets/objects/gameplay_keep/fairy_skel.h b/assets/objects/gameplay_keep/fairy_skel.h
index dcdf2f22e3..6b5816eeca 100644
--- a/assets/objects/gameplay_keep/fairy_skel.h
+++ b/assets/objects/gameplay_keep/fairy_skel.h
@@ -39,7 +39,7 @@ extern StandardLimb gFairySkelLimb_11;
 extern StandardLimb gFairySkelLimb_12;
 extern StandardLimb gFairySkelLimb_13;
 extern void* gFairyLimbs[];
-typedef enum gFairySkelLimb {
+typedef enum FairySkelLimb {
     /*  0 */ FAIRY_LIMB_NONE,
     /*  1 */ FAIRY_LIMB_0,
     /*  2 */ FAIRY_LIMB_1,
@@ -56,7 +56,7 @@ typedef enum gFairySkelLimb {
     /* 13 */ FAIRY_LIMB_12,
     /* 14 */ FAIRY_LIMB_13,
     /* 15 */ FAIRY_LIMB_MAX
-} gFairySkelLimb;
+} FairySkelLimb;
 extern SkeletonHeader gFairySkel;
 
 #endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
index edba23e871..fe2edbc658 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x18610.h
@@ -24,7 +24,7 @@ extern StandardLimb gFishSkelLimb_3;
 extern StandardLimb gFishSkelLimb_4;
 extern StandardLimb gFishSkelLimb_5;
 extern void* gFishLimbs[];
-typedef enum gFishSkelLimb {
+typedef enum FishSkelLimb {
     /*  0 */ FISH_LIMB_NONE,
     /*  1 */ FISH_LIMB_0,
     /*  2 */ FISH_LIMB_1,
@@ -33,7 +33,7 @@ typedef enum gFishSkelLimb {
     /*  5 */ FISH_LIMB_4,
     /*  6 */ FISH_LIMB_5,
     /*  7 */ FISH_LIMB_MAX
-} gFishSkelLimb;
+} FishSkelLimb;
 extern FlexSkeletonHeader gFishSkel;
 
 #endif
diff --git a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
index 37d742e869..39cb24611d 100644
--- a/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
+++ b/assets/objects/gameplay_keep/gameplay_keep_0x34020.h
@@ -74,7 +74,7 @@ extern StandardLimb gBugSkelLimb_20;
 extern StandardLimb gBugSkelLimb_21;
 extern StandardLimb gBugSkelLimb_22;
 extern void* gBugLimbs[];
-typedef enum gBugSkelLimb {
+typedef enum BugSkelLimb {
     /*  0 */ BUG_LIMB_NONE,
     /*  1 */ BUG_LIMB_0,
     /*  2 */ BUG_LIMB_1,
@@ -100,7 +100,7 @@ typedef enum gBugSkelLimb {
     /* 22 */ BUG_LIMB_21,
     /* 23 */ BUG_LIMB_22,
     /* 24 */ BUG_LIMB_MAX
-} gBugSkelLimb;
+} BugSkelLimb;
 extern SkeletonHeader gBugSkel;
 
 #endif