diff --git a/include/Item/Item.hpp b/include/Item/Item.hpp
index 4ee00ca4..bc77663b 100644
--- a/include/Item/Item.hpp
+++ b/include/Item/Item.hpp
@@ -25,56 +25,56 @@ enum ItemFlag_ {
     ItemFlag_Scroll2       = FLAG(0, 11),
     ItemFlag_AncientShield = FLAG(0, 12),
     ItemFlag_PanFlute      = FLAG(0, 13),
-    ItemFlag_14      = FLAG(0, 14),
-    ItemFlag_15      = FLAG(0, 15),
-    ItemFlag_16      = FLAG(0, 16),
-    ItemFlag_17      = FLAG(0, 17),
-    ItemFlag_18      = FLAG(0, 18),
-    ItemFlag_19      = FLAG(0, 19),
-    ItemFlag_20      = FLAG(0, 20),
-    ItemFlag_21      = FLAG(0, 21),
-    ItemFlag_22      = FLAG(0, 22),
-    ItemFlag_23      = FLAG(0, 23),
-    ItemFlag_24      = FLAG(0, 24),
-    ItemFlag_25      = FLAG(0, 25),
-    ItemFlag_26      = FLAG(0, 26),
-    ItemFlag_27      = FLAG(0, 27),
-    ItemFlag_28      = FLAG(0, 28),
-    ItemFlag_29      = FLAG(0, 29),
-    ItemFlag_30      = FLAG(0, 30),
-    ItemFlag_31      = FLAG(0, 31),
-    ItemFlag_32      = FLAG(1, 0),
-    ItemFlag_33      = FLAG(1, 1),
-    ItemFlag_34      = FLAG(1, 2),
-    ItemFlag_35      = FLAG(1, 3),
-    ItemFlag_36      = FLAG(1, 4),
-    ItemFlag_37      = FLAG(1, 5),
-    ItemFlag_38      = FLAG(1, 6),
-    ItemFlag_39      = FLAG(1, 7),
-    ItemFlag_40      = FLAG(1, 8),
-    ItemFlag_41      = FLAG(1, 9),
-    ItemFlag_42      = FLAG(1, 10),
-    ItemFlag_43      = FLAG(1, 11),
-    ItemFlag_44      = FLAG(1, 12),
-    ItemFlag_45      = FLAG(1, 13),
-    ItemFlag_46      = FLAG(1, 14),
-    ItemFlag_47      = FLAG(1, 15),
-    ItemFlag_48      = FLAG(1, 16),
-    ItemFlag_49      = FLAG(1, 17),
-    ItemFlag_50      = FLAG(1, 18),
-    ItemFlag_51      = FLAG(1, 19),
-    ItemFlag_52      = FLAG(1, 20),
-    ItemFlag_53      = FLAG(1, 21),
-    ItemFlag_54      = FLAG(1, 22),
-    ItemFlag_55      = FLAG(1, 23),
-    ItemFlag_56      = FLAG(1, 24),
-    ItemFlag_57      = FLAG(1, 25),
-    ItemFlag_58      = FLAG(1, 26),
-    ItemFlag_59      = FLAG(1, 27),
-    ItemFlag_60      = FLAG(1, 28),
-    ItemFlag_61      = FLAG(1, 29),
-    ItemFlag_62      = FLAG(1, 30),
-    ItemFlag_63      = FLAG(1, 31),
+    ItemFlag_14            = FLAG(0, 14),
+    ItemFlag_15            = FLAG(0, 15),
+    ItemFlag_16            = FLAG(0, 16),
+    ItemFlag_17            = FLAG(0, 17),
+    ItemFlag_18            = FLAG(0, 18),
+    ItemFlag_19            = FLAG(0, 19),
+    ItemFlag_20            = FLAG(0, 20),
+    ItemFlag_21            = FLAG(0, 21),
+    ItemFlag_22            = FLAG(0, 22),
+    ItemFlag_23            = FLAG(0, 23),
+    ItemFlag_24            = FLAG(0, 24),
+    ItemFlag_25            = FLAG(0, 25),
+    ItemFlag_26            = FLAG(0, 26),
+    ItemFlag_27            = FLAG(0, 27),
+    ItemFlag_28            = FLAG(0, 28),
+    ItemFlag_29            = FLAG(0, 29),
+    ItemFlag_30            = FLAG(0, 30),
+    ItemFlag_31            = FLAG(0, 31),
+    ItemFlag_32            = FLAG(1, 0),
+    ItemFlag_33            = FLAG(1, 1),
+    ItemFlag_34            = FLAG(1, 2),
+    ItemFlag_35            = FLAG(1, 3),
+    ItemFlag_36            = FLAG(1, 4),
+    ItemFlag_37            = FLAG(1, 5),
+    ItemFlag_38            = FLAG(1, 6),
+    ItemFlag_39            = FLAG(1, 7),
+    ItemFlag_40            = FLAG(1, 8),
+    ItemFlag_41            = FLAG(1, 9),
+    ItemFlag_42            = FLAG(1, 10),
+    ItemFlag_43            = FLAG(1, 11),
+    ItemFlag_44            = FLAG(1, 12),
+    ItemFlag_45            = FLAG(1, 13),
+    ItemFlag_46            = FLAG(1, 14),
+    ItemFlag_47            = FLAG(1, 15),
+    ItemFlag_48            = FLAG(1, 16),
+    ItemFlag_49            = FLAG(1, 17),
+    ItemFlag_50            = FLAG(1, 18),
+    ItemFlag_51            = FLAG(1, 19),
+    ItemFlag_52            = FLAG(1, 20),
+    ItemFlag_53            = FLAG(1, 21),
+    ItemFlag_54            = FLAG(1, 22),
+    ItemFlag_55            = FLAG(1, 23),
+    ItemFlag_56            = FLAG(1, 24),
+    ItemFlag_57            = FLAG(1, 25),
+    ItemFlag_58            = FLAG(1, 26),
+    ItemFlag_59            = FLAG(1, 27),
+    ItemFlag_60            = FLAG(1, 28),
+    ItemFlag_61            = FLAG(1, 29),
+    ItemFlag_62            = FLAG(1, 30),
+    ItemFlag_63            = FLAG(1, 31),
     ItemFlag_Max
 };
 
@@ -98,17 +98,17 @@ enum ItemId_ {
     ItemId_BigGreenRupee         = 15,
     ItemId_BigRedRupee           = 16,
     ItemId_BigGoldRupee          = 17,
-    ItemId_ForceGem13            = 18, // kidnapped papuchia man
-    ItemId_ForceGem14            = 19, // ice for fish seller
-    ItemId_ForceGem8             = 20, // goron lava house ice
+    ItemId_ForceGem_18           = 18, // kidnapped papuchia man
+    ItemId_ForceGem_19           = 19, // ice for fish seller
+    ItemId_ForceGem_20           = 20, // goron lava house ice
     ItemId_ForestGlyph           = 21,
     ItemId_SnowGlyph             = 22,
     ItemId_OceanGlyph            = 23,
     ItemId_FireGlyph             = 24,
     ItemId_FinalTrack            = 30, // unlocks the endgame portal
-    ItemId_ForceGemX             = 35, // rightmost fire gem
-    ItemId_ForceGemXx            = 36, // right snow gem
-    ItemId_ForceGemXxx           = 37, // top fire gem
+    ItemId_ForceGem_35           = 35, // rightmost fire gem
+    ItemId_ForceGem_36           = 36, // right snow gem
+    ItemId_ForceGem_37           = 37, // top fire gem
     ItemId_RecruitUniform        = 38,
     ItemId_PostmasterLetter      = 39,
     ItemId_HeartContainer        = 40,