diff --git a/include/d/d_item_data.h b/include/d/d_item_data.h
index 0c80b68c5..e67e9e383 100644
--- a/include/d/d_item_data.h
+++ b/include/d/d_item_data.h
@@ -11,8 +11,8 @@ enum ItemTable {
     /* 0x04 */ dItem_RED_RUPEE_e,
     /* 0x05 */ dItem_PURPLE_RUPEE_e,
     /* 0x06 */ dItem_ORANGE_RUPEE_e,
-    /* 0x07 */ KAKERA_HEART,
-    /* 0x08 */ UTUWA_HEART,
+    /* 0x07 */ dItem_HEART_PIECE_e,
+    /* 0x08 */ dItem_HEART_CONTAINER_e,
     /* 0x09 */ S_MAGIC,
     /* 0x0A */ L_MAGIC,
     /* 0x0B */ BOMB_5,
@@ -53,7 +53,7 @@ enum ItemTable {
     /* 0x2E */ BARE_HAND, // Unused
     /* 0x2F */ dItem_HOOKSHOT_e,
     /* 0x30 */ dItem_DELIVERY_BAG_e,
-    /* 0x31 */ BOMB_BAG,
+    /* 0x31 */ dItem_BOMB_BAG_e,
     /* 0x32 */ dItem_FUKU_e,
     /* 0x33 */ dItem_SKULL_HAMMER_e,
     /* 0x34 */ dItem_DEKU_LEAF_e,
@@ -101,14 +101,14 @@ enum ItemTable {
     /* 0x5E */ UNK_BOTTLE_5E, // Unused
     /* 0x5F */ UNK_BOTTLE_5F, // Unused
     /* 0x60 */ UNK_BOTTLE_60, // Unused
-    /* 0x61 */ TRIFORCE1,
-    /* 0x62 */ TRIFORCE2,
-    /* 0x63 */ TRIFORCE3,
-    /* 0x64 */ TRIFORCE4,
-    /* 0x65 */ TRIFORCE5,
-    /* 0x66 */ TRIFORCE6,
-    /* 0x67 */ TRIFORCE7,
-    /* 0x68 */ TRIFORCE8,
+    /* 0x61 */ dItem_TRIFORCE1_e,
+    /* 0x62 */ dItem_TRIFORCE2_e,
+    /* 0x63 */ dItem_TRIFORCE3_e,
+    /* 0x64 */ dItem_TRIFORCE4_e,
+    /* 0x65 */ dItem_TRIFORCE5_e,
+    /* 0x66 */ dItem_TRIFORCE6_e,
+    /* 0x67 */ dItem_TRIFORCE7_e,
+    /* 0x68 */ dItem_TRIFORCE8_e,
     /* 0x69 */ dItem_PEARL_NAYRU_e,
     /* 0x6A */ dItem_PEARL_DIN_e,
     /* 0x6B */ dItem_PEARL_FARORE_e,
diff --git a/src/d/actor/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp
index 5d2c4fb24..c77a0d167 100644
--- a/src/d/actor/d_a_agb.cpp
+++ b/src/d/actor/d_a_agb.cpp
@@ -1002,7 +1002,7 @@ void daAgb_c::GbaItemUse() {
                 temp_r29 |= 0x1000000;
             }
 
-            if (dComIfGs_checkGetItem(BOMB_BAG) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
+            if (dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
                 temp_r29 |= 0x10000;
             }
 
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index 99c75dc54..5a0ccfc9e 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -1476,7 +1476,7 @@ BOOL daAgbsw0_c::ExeSubD() {
                     if(itemNo != RECOVER_FAIRY) {
                         current.pos.y += scale.y / 2;
                     }
-                    if(0 <= itemNo && itemNo < 0x1F && itemNo != KAKERA_HEART && itemNo != UTUWA_HEART && itemNo != dItem_SMALL_KEY_e) {
+                    if(0 <= itemNo && itemNo < 0x1F && itemNo != dItem_HEART_PIECE_e && itemNo != dItem_HEART_CONTAINER_e && itemNo != dItem_SMALL_KEY_e) {
                         s8 roomNo = fopAcM_GetHomeRoomNo(this);
                         f32 rnd = cM_rndF(10.0f) + 40.0f;
                         fopAcM_fastCreateItem(&current.pos, itemNo, roomNo, NULL, NULL, 0.0f, rnd, -7.0f);
@@ -1763,7 +1763,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x15:
-            if(dComIfGp_getSelectItem(0) != BOMB_BAG && dComIfGp_getSelectItem(1) != BOMB_BAG && dComIfGp_getSelectItem(2) != BOMB_BAG) {
+            if(dComIfGp_getSelectItem(0) != dItem_BOMB_BAG_e && dComIfGp_getSelectItem(1) != dItem_BOMB_BAG_e && dComIfGp_getSelectItem(2) != dItem_BOMB_BAG_e) {
                 return 0;
             }
 
@@ -1799,7 +1799,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x1B:
-            if(dComIfGs_checkGetItem(BOMB_BAG) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
+            if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() < dComIfGs_getBombMax()) {
                 return 0;
             }
 
@@ -1823,7 +1823,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x1F:
-            if(dComIfGs_checkGetItem(BOMB_BAG) && dComIfGs_getBombNum() == 0) {
+            if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) {
                 return 0;
             }
 
@@ -1835,7 +1835,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x21:
-            if(dComIfGs_isEventBit(0x1708) && dComIfGs_checkGetItem(BOMB_BAG) && dComIfGs_getBombNum() == 0) {
+            if(dComIfGs_isEventBit(0x1708) && dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && dComIfGs_getBombNum() == 0) {
                 return 0;
             }
 
@@ -1860,9 +1860,9 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
             break;
         case 0x25:
             if (dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e) &&
-                dComIfGp_getSelectItem(0) != BOMB_BAG &&
-                dComIfGp_getSelectItem(1) != BOMB_BAG &&
-                dComIfGp_getSelectItem(2) != BOMB_BAG)
+                dComIfGp_getSelectItem(0) != dItem_BOMB_BAG_e &&
+                dComIfGp_getSelectItem(1) != dItem_BOMB_BAG_e &&
+                dComIfGp_getSelectItem(2) != dItem_BOMB_BAG_e)
             {
                 return 0;
             }
@@ -1903,7 +1903,7 @@ BOOL daAgbsw0_c::MoveCheck(s16 param_1) {
 
             break;
         case 0x2B:
-            if(dComIfGs_checkGetItem(BOMB_BAG)) {
+            if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
                 return 0;
             }
 
diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp
index d3b158a00..23ec92711 100644
--- a/src/d/actor/d_a_auction.cpp
+++ b/src/d/actor/d_a_auction.cpp
@@ -63,7 +63,7 @@ static daAuction_c::ItemData l_item_dat[] = {
     {dItem_JOY_PENDANT_e, 0x1D10, 40, 0x0F01},
     {COLLECT_MAP_27, 0x1D11, 5, 0x1080},
     {COLLECT_MAP_18, 0x1D12, 60, 0x1040},
-    {KAKERA_HEART, 0x1D13, 80, 0x1020},
+    {dItem_HEART_PIECE_e, 0x1D13, 80, 0x1020},
 };
 
 static daAuction_c::ItemData l_item_dat2[] = {
diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp
index 1b03f379a..b8b29c3a5 100644
--- a/src/d/actor/d_a_demo_item.cpp
+++ b/src/d/actor/d_a_demo_item.cpp
@@ -26,8 +26,8 @@ u8 daDitem_c::m_effect_type[0x100] = {
     0x03, // dItem_RED_RUPEE_e
     0x03, // dItem_PURPLE_RUPEE_e
     0x03, // dItem_ORANGE_RUPEE_e
-    0x00, // KAKERA_HEART
-    0x00, // UTUWA_HEART
+    0x00, // dItem_HEART_PIECE_e
+    0x00, // dItem_HEART_CONTAINER_e
     0x04, // S_MAGIC
     0x04, // L_MAGIC
     0x04, // BOMB_5
@@ -68,7 +68,7 @@ u8 daDitem_c::m_effect_type[0x100] = {
     0x04, // BARE_HAND
     0x00, // dItem_HOOKSHOT_e
     0x00, // dItem_DELIVERY_BAG_e
-    0x00, // BOMB_BAG
+    0x00, // dItem_BOMB_BAG_e
     0x03, // dItem_FUKU_e
     0x00, // dItem_SKULL_HAMMER_e
     0x00, // dItem_DEKU_LEAF_e
@@ -116,14 +116,14 @@ u8 daDitem_c::m_effect_type[0x100] = {
     0x04, // UNK_BOTTLE_5E
     0x04, // UNK_BOTTLE_5F
     0x04, // UNK_BOTTLE_60
-    0x00, // TRIFORCE1
-    0x00, // TRIFORCE2
-    0x00, // TRIFORCE3
-    0x00, // TRIFORCE4
-    0x00, // TRIFORCE5
-    0x00, // TRIFORCE6
-    0x00, // TRIFORCE7
-    0x00, // TRIFORCE8
+    0x00, // dItem_TRIFORCE1_e
+    0x00, // dItem_TRIFORCE2_e
+    0x00, // dItem_TRIFORCE3_e
+    0x00, // dItem_TRIFORCE4_e
+    0x00, // dItem_TRIFORCE5_e
+    0x00, // dItem_TRIFORCE6_e
+    0x00, // dItem_TRIFORCE7_e
+    0x00, // dItem_TRIFORCE8_e
     0x00, // dItem_PEARL_NAYRU_e
     0x00, // dItem_PEARL_DIN_e
     0x00, // dItem_PEARL_FARORE_e
@@ -427,7 +427,7 @@ void daDitem_c::set_mtx() {
 
 /* 00000880-000008F0       .text settingBeforeDraw__9daDitem_cFv */
 void daDitem_c::settingBeforeDraw() {
-    if (isBomb(m_itemNo) || m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
+    if (isBomb(m_itemNo) || m_itemNo == dItem_BOMB_BAG_e || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
         dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
     }
 }
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index ad727aab2..5381ccc2d 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -57,8 +57,8 @@ float daItem_c::getYOffset() {
         return 20.0f;
     case DROPPED_SWORD:
         return 10.0f;
-    case KAKERA_HEART:
-    case UTUWA_HEART:
+    case dItem_HEART_PIECE_e:
+    case dItem_HEART_CONTAINER_e:
         return 0.0f;
     case dItem_GREEN_RUPEE_e:
     case dItem_BLUE_RUPEE_e:
@@ -79,7 +79,7 @@ float daItem_c::getYOffset() {
 void daItem_c::set_mtx() {
     cXyz pos = current.pos;
     csXyz rot = current.angle;
-    if (m_itemNo == UTUWA_HEART) {
+    if (m_itemNo == dItem_HEART_CONTAINER_e) {
         rot.y = shape_angle.y;
     }
     set_mtx_base(mpModel, pos, rot);
@@ -612,11 +612,11 @@ void daItem_c::itemGetExecute() {
         mDoAud_seStart(JA_SE_RED_LUPY_GET);
         execItemGet(m_itemNo);
         break;
-    case KAKERA_HEART:
+    case dItem_HEART_PIECE_e:
         mDoAud_seStart(JA_SE_HEART_PIECE);
         mItemStatus = STATUS_INIT_GET_DEMO;
         break;
-    case UTUWA_HEART:
+    case dItem_HEART_CONTAINER_e:
         mDoAud_seStart(JA_SE_HEART_PIECE);
         mItemStatus = STATUS_INIT_GET_DEMO;
         break;
@@ -1070,12 +1070,12 @@ BOOL daItem_c::itemActionForArrow() {
     } else if (mAcch.ChkGroundHit()) {
         speedF = 0.0f;
         
-        if (m_itemNo != UTUWA_HEART) {
+        if (m_itemNo != dItem_HEART_CONTAINER_e) {
             itemDefaultRotateY();
         }
     }
     
-    if (m_itemNo == UTUWA_HEART) {
+    if (m_itemNo == dItem_HEART_CONTAINER_e) {
         if (mOnGroundTimer != 0) {
             getData();
             s16 rotationSpeed = 0xFFFF / getData()->mRotateYSpeed;
@@ -1146,8 +1146,8 @@ void daItem_c::set_bound_se() {
     case dItem_LIGHT_ARROW_e:
         fopAcM_seStart(this, JA_SE_CM_BST_ARROW_BOUND, temp);
         break;
-    case KAKERA_HEART:
-    case UTUWA_HEART:
+    case dItem_HEART_PIECE_e:
+    case dItem_HEART_CONTAINER_e:
         fopAcM_seStart(this, JA_SE_CM_BST_HEART_BOUND, temp);
         break;
     case BOMB_5:
@@ -1252,8 +1252,8 @@ void daItem_c::mode_wait() {
     case dItem_TRIPLE_HEART_e:
         itemActionForHeart();
         break;
-    case KAKERA_HEART:
-    case UTUWA_HEART:
+    case dItem_HEART_PIECE_e:
+    case dItem_HEART_CONTAINER_e:
     case BOMB_5:
     case BOMB_10:
     case BOMB_20:
diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp
index 6eb63e8a2..1328f090f 100644
--- a/src/d/actor/d_a_itembase.cpp
+++ b/src/d/actor/d_a_itembase.cpp
@@ -165,7 +165,7 @@ void daItemBase_c::settingBeforeDraw() {
         mpModel->getModelData()->getJointNodePointer(0)->setMtxCalc(NULL);
     }
     
-    if (m_itemNo == BOMB_BAG || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
+    if (m_itemNo == dItem_BOMB_BAG_e || m_itemNo == dItem_SKULL_HAMMER_e || m_itemNo == dItem_SMALL_KEY_e) {
         dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
     }
 }
diff --git a/src/d/actor/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp
index 7651f0613..790017c4d 100644
--- a/src/d/actor/d_a_npc_bs1.cpp
+++ b/src/d/actor/d_a_npc_bs1.cpp
@@ -893,7 +893,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
                 mShopItems.hideSelectItem();
                 dComIfGp_setItemRupeeCount(-rupee);
                 u8 itemNo = mShopItems.getSelectItemNo();
-                if(itemNo == EMPTY_BOTTLE || itemNo == KAKERA_HEART || itemNo == COLLECT_MAP_30) {
+                if(itemNo == EMPTY_BOTTLE || itemNo == dItem_HEART_PIECE_e || itemNo == COLLECT_MAP_30) {
                     mShopItems.SoldOutItem(mShopItems.mSelectedItemIdx);
                     m76C[mShopItems.mSelectedItemIdx] = 1;
 
@@ -901,7 +901,7 @@ u16 daNpc_Bs1_c::next_msgStatus(u32* pMsgNo) {
                         case EMPTY_BOTTLE:
                             dComIfGs_onEventBit(0x2020);
                             break;
-                        case KAKERA_HEART:
+                        case dItem_HEART_PIECE_e:
                             dComIfGs_onEventBit(0x2010);
                             break;
                         case COLLECT_MAP_30:
@@ -1045,7 +1045,7 @@ u32 daNpc_Bs1_c::getMsg() {
             if(mShopItems.isSoldOutItemAll()) {
                 msgNo = 0xF3D;
             }
-            else if(dComIfGs_checkGetItem(BOMB_BAG) && !dComIfGs_isEventBit(0x1F20) && isSellBomb()) {
+            else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(0x1F20) && isSellBomb()) {
                 dComIfGs_onEventBit(0x1F20);
                 m837 = 1;
                 msgNo = 0xF55;
@@ -1082,7 +1082,7 @@ u32 daNpc_Bs1_c::getMsg() {
         else if(mShopItems.isSoldOutItemAll()) {
             msgNo = 0x2F62;
         }
-        else if(dComIfGs_checkGetItem(BOMB_BAG) && !dComIfGs_isEventBit(0x1F20) && isSellBomb()) {
+        else if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && !dComIfGs_isEventBit(0x1F20) && isSellBomb()) {
             dComIfGs_onEventBit(0x1F20);
             m837 = 1;
             msgNo = 0x2F64;
@@ -1471,7 +1471,7 @@ void daNpc_Bs1_c::createShopList() {
         for(int i = 0; i < 3; i++) {
             u8 itemNo = pDataSet[i]->mpItemData->mItemNo;
             int idx = i;
-            if((itemNo == ESA_BAG && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(BOMB_BAG))) {
+            if((itemNo == ESA_BAG && dComIfGs_checkGetItem(itemNo)) || (itemNo == dItem_HYOI_PEAR_e && dComIfGs_checkGetItem(dItem_BOMB_BAG_e))) {
                 itemNo = pDataSet[i + 3][0].mpItemData->mItemNo;
                 idx += 3;
             }
@@ -1485,7 +1485,7 @@ void daNpc_Bs1_c::createShopList() {
         __shop_items_set_data* dataSet[4];
         int index = 0;
 
-        if(dComIfGs_checkGetItem(BOMB_BAG)) {
+        if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
             dataSet[index] = &shopItems_setData_Bomb30Bs2;
             index = 1;
         }
@@ -1495,7 +1495,7 @@ void daNpc_Bs1_c::createShopList() {
         }
         dataSet[index] = &shopItems_setData_red_bottleBs2;
         index++;
-        if(!dComIfGs_checkGetItem(BOMB_BAG)) {
+        if(!dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
             dataSet[index] = &shopItems_setData_Bomb30Bs2;
             index++;
         }
@@ -1523,7 +1523,7 @@ void daNpc_Bs1_c::createShopList() {
     mShopItems.setItemSetDataList(mpItemSetList);
     for(int i = 0; i < 3; i++) {
         mShopItems.mSelectedItemIdx = i;
-        if((!dComIfGs_checkGetItem(BOMB_BAG) && isBomb(mShopItems.getSelectItemNo())) || (dComIfGs_getItem(0xC) == dItem_NONE_e && isArrow(mShopItems.getSelectItemNo()))) {
+        if((!dComIfGs_checkGetItem(dItem_BOMB_BAG_e) && isBomb(mShopItems.getSelectItemNo())) || (dComIfGs_getItem(0xC) == dItem_NONE_e && isArrow(mShopItems.getSelectItemNo()))) {
             mShopItems.SoldOutItem(i);
             m76C[i] = true;
         }
diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp
index 6803e8b01..2213a6cb3 100644
--- a/src/d/actor/d_a_npc_ji1.cpp
+++ b/src/d/actor/d_a_npc_ji1.cpp
@@ -1262,7 +1262,7 @@ void daNpc_Ji1_c::createItem() {
         itemNo = dItem_SILVER_RUPEE_e;
     }
     else {
-        itemNo = KAKERA_HEART;
+        itemNo = dItem_HEART_PIECE_e;
         dComIfGs_onEventBit(0xF10);
     }
 
diff --git a/src/d/actor/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp
index c9d467057..7d6c8e86e 100644
--- a/src/d/actor/d_a_npc_nz.cpp
+++ b/src/d/actor/d_a_npc_nz.cpp
@@ -625,7 +625,7 @@ u16 daNpc_Nz_c::next_msgStatus(u32* pMsgNo) {
             if(dComIfGs_checkGetBottle()) {
                 temp += 1;
             }
-            if(dComIfGs_checkGetItem(BOMB_BAG)) {
+            if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
                 temp += 1;
             }
             if(dComIfGs_getItem(0xC) != dItem_NONE_e) {
diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp
index 3a83fb2c7..77cb03e2c 100644
--- a/src/d/actor/d_a_npc_roten.cpp
+++ b/src/d/actor/d_a_npc_roten.cpp
@@ -1349,7 +1349,7 @@ static u32 l_msg_try_force[] = {
 };
 
 static u32 l_get_item_no[] = {
-    KAKERA_HEART,
+    dItem_HEART_PIECE_e,
 };
 
 static dCcD_SrcSph l_sph_src = {
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index 610d44647..6c0357c3e 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -23,15 +23,15 @@ extern dScnPly_reg_HIO_c g_regHIO;
 const char daObjTpost_c::m_arc_name[] = "Toripost";
 
 const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
-    {false, 0x1AAF, KAKERA_HEART,        dSv_evtBit_c::LETTER_BAITOS_MOM},
-    {false, 0x0CF9, KAKERA_HEART,        dSv_evtBit_c::LETTER_KOMALIS_FATHER},
+    {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM},
+    {false, 0x0CF9, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_KOMALIS_FATHER},
     {false, 0x0CFA, COLLECT_MAP_60,      dSv_evtBit_c::LETTER_BOMBS_AD},
     {false, 0x0CFC, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_ORCA},
     {false, 0x0805, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_GRANDMA},
     {false, 0x0CFD, dItem_GREEN_RUPEE_e, dSv_evtBit_c::LETTER_ROCK_SPIRE_SHOP_AD},
     {true,  0x0DB6, COLLECT_MAP_52,      dSv_evtBit_c::LETTER_TINGLE},
     {false, 0x1148, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_ARYLL},
-    {false, 0x1AAF, KAKERA_HEART,        dSv_evtBit_c::LETTER_BAITOS_MOM},
+    {false, 0x1AAF, dItem_HEART_PIECE_e, dSv_evtBit_c::LETTER_BAITOS_MOM},
     {true,  0x0F76, KAISEN_PRESENT1,     dSv_evtBit_c::LETTER_SILVER_MEMBERSHIP},
     {false, 0x19A6, KAKERA_HEART2,       dSv_evtBit_c::LETTER_HOSKITS_GIRLFRIEND},
     {true,  0x0CFB, dItem_RED_RUPEE_e,   dSv_evtBit_c::LETTER_BAITO},
@@ -905,7 +905,7 @@ void daObjTpost_c::createInit() {
         dLetter_autoStock(0xB503);
     }
 
-    if(dComIfGs_checkGetItem(BOMB_BAG)) {
+    if(dComIfGs_checkGetItem(dItem_BOMB_BAG_e)) {
         dLetter_autoStock(0x7D03);
     }
 
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 43f4d5eb8..a15c25ad3 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -1463,7 +1463,7 @@ void daPy_lk_c::makeItemType() {
         fopAc_ac_c* boomerang = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOOMERANG, 0, &current.pos);
         mActorKeepEquip.setData(boomerang);
         return;
-    } else if (mEquipItem == BOMB_BAG) {
+    } else if (mEquipItem == dItem_BOMB_BAG_e) {
         fopAc_ac_c* bomb = (fopAc_ac_c*)fopAcM_fastCreate(PROC_BOMB, daBomb_c::prm_make(daBomb_c::STATE_3, false, false), &current.pos);
         mActorKeepGrab.setData(bomb);
         mEquipItem = daPyItem_NONE_e;
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 433474a22..b0d2f6a74 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -168,7 +168,7 @@ bool daShopItem_c::_draw() {
 
 /* 00000694-0000070C       .text settingBeforeDraw__12daShopItem_cFv */
 void daShopItem_c::settingBeforeDraw() {
-    if(isBomb(m_itemNo) || (m_itemNo == BOMB_BAG) || (m_itemNo == dItem_SKULL_HAMMER_e) || m_itemNo == dItem_SMALL_KEY_e || m_itemNo == PRESIDENT_STATUE) {
+    if(isBomb(m_itemNo) || (m_itemNo == dItem_BOMB_BAG_e) || (m_itemNo == dItem_SKULL_HAMMER_e) || m_itemNo == dItem_SMALL_KEY_e || m_itemNo == PRESIDENT_STATUE) {
         dDlst_texSpecmapST(&eyePos, &tevStr, mpModel->getModelData(), 1.0f);
     }
 }
diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp
index cd99eb94f..a43e5b9c8 100644
--- a/src/d/d_com_inf_game.cpp
+++ b/src/d/d_com_inf_game.cpp
@@ -754,42 +754,42 @@ u8 dComIfGs_checkGetItem(u8 i_itemNo) {
             get_item = 1;
         }
         break;
-    case TRIFORCE1:
+    case dItem_TRIFORCE1_e:
         if (dComIfGs_isTriforce(0)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE2:
+    case dItem_TRIFORCE2_e:
         if (dComIfGs_isTriforce(1)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE3:
+    case dItem_TRIFORCE3_e:
         if (dComIfGs_isTriforce(2)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE4:
+    case dItem_TRIFORCE4_e:
         if (dComIfGs_isTriforce(3)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE5:
+    case dItem_TRIFORCE5_e:
         if (dComIfGs_isTriforce(4)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE6:
+    case dItem_TRIFORCE6_e:
         if (dComIfGs_isTriforce(5)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE7:
+    case dItem_TRIFORCE7_e:
         if (dComIfGs_isTriforce(6)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE8:
+    case dItem_TRIFORCE8_e:
         if (dComIfGs_isTriforce(7)) {
             get_item = 1;
         }
@@ -878,42 +878,42 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
             get_item = 1;
         }
         break;
-    case TRIFORCE1:
+    case dItem_TRIFORCE1_e:
         if (dComIfGs_isTriforce(0)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE2:
+    case dItem_TRIFORCE2_e:
         if (dComIfGs_isTriforce(1)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE3:
+    case dItem_TRIFORCE3_e:
         if (dComIfGs_isTriforce(2)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE4:
+    case dItem_TRIFORCE4_e:
         if (dComIfGs_isTriforce(3)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE5:
+    case dItem_TRIFORCE5_e:
         if (dComIfGs_isTriforce(4)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE6:
+    case dItem_TRIFORCE6_e:
         if (dComIfGs_isTriforce(5)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE7:
+    case dItem_TRIFORCE7_e:
         if (dComIfGs_isTriforce(6)) {
             get_item = 1;
         }
         break;
-    case TRIFORCE8:
+    case dItem_TRIFORCE8_e:
         if (dComIfGs_isTriforce(7)) {
             get_item = 1;
         }
@@ -948,7 +948,7 @@ u8 dComIfGs_checkGetItemNum(u8 i_itemNo) {
             get_item = dComIfGs_getArrowNum();
         }
         break;
-    case BOMB_BAG:
+    case dItem_BOMB_BAG_e:
         if (dComIfGs_getItem(13) != dItem_HEART_e) { // Bug?
             get_item = dComIfGs_getBombNum();
         }
diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index d582b079c..94ba204e7 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -618,21 +618,21 @@ void item_func_bomb_5() {
 /* 800C3060-800C30B0       .text item_func_bomb_10__Fv */
 void item_func_bomb_10() {
     dComIfGs_onGetItem(0xD, 0);
-    dComIfGs_setItem(0xD, BOMB_BAG);
+    dComIfGs_setItem(0xD, dItem_BOMB_BAG_e);
     dComIfGp_setItemBombNumCount(10);
 }
 
 /* 800C30B0-800C3100       .text item_func_bomb_20__Fv */
 void item_func_bomb_20() {
     dComIfGs_onGetItem(0xD, 0);
-    dComIfGs_setItem(0xD, BOMB_BAG);
+    dComIfGs_setItem(0xD, dItem_BOMB_BAG_e);
     dComIfGp_setItemBombNumCount(20);
 }
 
 /* 800C3100-800C3150       .text item_func_bomb_30__Fv */
 void item_func_bomb_30() {
     dComIfGs_onGetItem(0xD, 0);
-    dComIfGs_setItem(0xD, BOMB_BAG);
+    dComIfGs_setItem(0xD, dItem_BOMB_BAG_e);
     dComIfGp_setItemBombNumCount(30);
 }
 
@@ -786,7 +786,7 @@ void item_func_warasibe_bag() {
 /* 800C3688-800C36D8       .text item_func_bomb_bag__Fv */
 void item_func_bomb_bag() {
     dComIfGs_onGetItem(0xD, 0);
-    dComIfGs_setItem(0xD, BOMB_BAG);
+    dComIfGs_setItem(0xD, dItem_BOMB_BAG_e);
     dComIfGs_setBombNum(30);
     dComIfGs_setBombMax(30);
 }
@@ -2712,8 +2712,8 @@ BOOL isUseClothPacket(u8 itemNo) {
 /* 800C7CDC-800C7D08       .text isTriforce__FUc */
 BOOL isTriforce(u8 itemNo) {
     BOOL isTriforce = FALSE;
-    if (itemNo == TRIFORCE1 || itemNo == TRIFORCE2 || itemNo == TRIFORCE3 || itemNo == TRIFORCE4 ||
-        itemNo == TRIFORCE5 || itemNo == TRIFORCE6 || itemNo == TRIFORCE7 || itemNo == TRIFORCE8)
+    if (itemNo == dItem_TRIFORCE1_e || itemNo == dItem_TRIFORCE2_e || itemNo == dItem_TRIFORCE3_e || itemNo == dItem_TRIFORCE4_e ||
+        itemNo == dItem_TRIFORCE5_e || itemNo == dItem_TRIFORCE6_e || itemNo == dItem_TRIFORCE7_e || itemNo == dItem_TRIFORCE8_e)
     {
         isTriforce = TRUE;
     }
diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp
index b680b732e..da7ffacb9 100644
--- a/src/d/d_item_data.cpp
+++ b/src/d/d_item_data.cpp
@@ -703,7 +703,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x17C0
     },
     {
-        // 0x07: KAKERA_HEART
+        // 0x07: dItem_HEART_PIECE_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VHKAK],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_HEART_UP_02],
         /* mBmdIdx      */ VHKAK_BDL_VHKAK,
@@ -719,7 +719,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x2420
     },
     {
-        // 0x08: UTUWA_HEART
+        // 0x08: dItem_HEART_CONTAINER_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VHUTU],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_HEART_UP_01],
         /* mBmdIdx      */ VHUTU_BDL_VHUTU,
@@ -1375,7 +1375,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x31: BOMB_BAG
+        // 0x31: dItem_BOMB_BAG_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_BOMB_00],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_BOMB_00],
         /* mBmdIdx      */ BOMB_00_BDL_VBOMB,
@@ -2143,7 +2143,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x0000
     },
     {
-        // 0x61: TRIFORCE1
+        // 0x61: dItem_TRIFORCE1_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI1],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_00],
         /* mBmdIdx      */ VTRI1_BDL_VTRI1,
@@ -2159,7 +2159,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x62: TRIFORCE2
+        // 0x62: dItem_TRIFORCE2_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI2],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_01],
         /* mBmdIdx      */ VTRI2_BDL_VTRI2,
@@ -2175,7 +2175,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x63: TRIFORCE3
+        // 0x63: dItem_TRIFORCE3_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI3],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_02],
         /* mBmdIdx      */ VTRI3_BDL_VTRI3,
@@ -2191,7 +2191,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x64: TRIFORCE4
+        // 0x64: dItem_TRIFORCE4_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI4],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_03],
         /* mBmdIdx      */ VTRI4_BDL_VTRI4,
@@ -2207,7 +2207,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x65: TRIFORCE5
+        // 0x65: dItem_TRIFORCE5_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI5],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_04],
         /* mBmdIdx      */ VTRI5_BDL_VTRI5,
@@ -2223,7 +2223,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x66: TRIFORCE6
+        // 0x66: dItem_TRIFORCE6_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI6],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_05],
         /* mBmdIdx      */ VTRI6_BDL_VTRI6,
@@ -2239,7 +2239,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x67: TRIFORCE7
+        // 0x67: dItem_TRIFORCE7_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI7],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_06],
         /* mBmdIdx      */ VTRI7_BDL_VTRI7,
@@ -2255,7 +2255,7 @@ dItem_data_item_resource dItem_data::item_resource[0x100] = {
         /* mHeapSize    */ 0x1000
     },
     {
-        // 0x68: TRIFORCE8
+        // 0x68: dItem_TRIFORCE8_e
         /* mArcname     */ item_arcname_tbl[ARCNAME_IDX_VTRI8],
         /* mTexture     */ item_texture_tbl[TEXTURE_IDX_TRIFORCE_07],
         /* mBmdIdx      */ VTRI8_BDL_VTRI8,
@@ -4782,7 +4782,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0CA0
     },
     {
-        // 0x07: KAKERA_HEART
+        // 0x07: dItem_HEART_PIECE_e
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mBmdIdx   */ ALWAYS_BDL_VHKAL,
         /* mSrtIdx   */ ALWAYS_BTK_VHKAL,
@@ -4795,7 +4795,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0C40
     },
     {
-        // 0x08: UTUWA_HEART
+        // 0x08: dItem_HEART_CONTAINER_e
         /* mArc      */ item_arcname_tbl[ARCNAME_IDX_ALWAYS],
         /* mBmdIdx   */ ALWAYS_BDL_VHUTL,
         /* mSrtIdx   */ ALWAYS_BTK_VHUTL,
@@ -5328,7 +5328,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x31: BOMB_BAG
+        // 0x31: dItem_BOMB_BAG_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -5952,7 +5952,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x61: TRIFORCE1
+        // 0x61: dItem_TRIFORCE1_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -5965,7 +5965,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x62: TRIFORCE2
+        // 0x62: dItem_TRIFORCE2_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -5978,7 +5978,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x63: TRIFORCE3
+        // 0x63: dItem_TRIFORCE3_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -5991,7 +5991,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x64: TRIFORCE4
+        // 0x64: dItem_TRIFORCE4_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -6004,7 +6004,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x65: TRIFORCE5
+        // 0x65: dItem_TRIFORCE5_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -6017,7 +6017,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x66: TRIFORCE6
+        // 0x66: dItem_TRIFORCE6_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -6030,7 +6030,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x67: TRIFORCE7
+        // 0x67: dItem_TRIFORCE7_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -6043,7 +6043,7 @@ dItem_data_field_item_res dItem_data::field_item_res[0x100] = {
         /* mHeapSize */ 0x0000
     },
     {
-        // 0x68: TRIFORCE8
+        // 0x68: dItem_TRIFORCE8_e
         /* mArc      */ NULL,
         /* mBmdIdx   */ -1,
         /* mSrtIdx   */ -1,
@@ -8072,14 +8072,14 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
         0x00,
     },
     {
-        // 0x07: KAKERA_HEART
+        // 0x07: dItem_HEART_PIECE_e
         0x32,
         0x50,
         0x32,
         0x01,
     },
     {
-        // 0x08: UTUWA_HEART
+        // 0x08: dItem_HEART_CONTAINER_e
         0x32,
         0x50,
         0x32,
@@ -8366,7 +8366,7 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
         0x00,
     },
     {
-        // 0x31: BOMB_BAG
+        // 0x31: dItem_BOMB_BAG_e
         0x00,
         0x00,
         0x00,
@@ -8702,56 +8702,56 @@ dItem_data_item_info dItem_data::item_info[0x100] = {
         0x00,
     },
     {
-        // 0x61: TRIFORCE1
+        // 0x61: dItem_TRIFORCE1_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x62: TRIFORCE2
+        // 0x62: dItem_TRIFORCE2_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x63: TRIFORCE3
+        // 0x63: dItem_TRIFORCE3_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x64: TRIFORCE4
+        // 0x64: dItem_TRIFORCE4_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x65: TRIFORCE5
+        // 0x65: dItem_TRIFORCE5_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x66: TRIFORCE6
+        // 0x66: dItem_TRIFORCE6_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x67: TRIFORCE7
+        // 0x67: dItem_TRIFORCE7_e
         0x00,
         0x00,
         0x00,
         0x00,
     },
     {
-        // 0x68: TRIFORCE8
+        // 0x68: dItem_TRIFORCE8_e
         0x00,
         0x00,
         0x00,
@@ -9854,12 +9854,12 @@ dItem_data_effect_info dItem_data::effect_info[0x81] = {
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x07: KAKERA_HEART
+        // 0x07: dItem_HEART_PIECE_e
         dPa_name::ID_SCENE_END,
         0x0293,
     },
     {
-        // 0x08: UTUWA_HEART
+        // 0x08: dItem_HEART_CONTAINER_e
         dPa_name::ID_SCENE_END,
         0x0293,
     },
@@ -10064,7 +10064,7 @@ dItem_data_effect_info dItem_data::effect_info[0x81] = {
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x31: BOMB_BAG
+        // 0x31: dItem_BOMB_BAG_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
@@ -10304,42 +10304,42 @@ dItem_data_effect_info dItem_data::effect_info[0x81] = {
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x61: TRIFORCE1
+        // 0x61: dItem_TRIFORCE1_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x62: TRIFORCE2
+        // 0x62: dItem_TRIFORCE2_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x63: TRIFORCE3
+        // 0x63: dItem_TRIFORCE3_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x64: TRIFORCE4
+        // 0x64: dItem_TRIFORCE4_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x65: TRIFORCE5
+        // 0x65: dItem_TRIFORCE5_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x66: TRIFORCE6
+        // 0x66: dItem_TRIFORCE6_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x67: TRIFORCE7
+        // 0x67: dItem_TRIFORCE7_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
     {
-        // 0x68: TRIFORCE8
+        // 0x68: dItem_TRIFORCE8_e
         dPa_name::ID_SCENE_END,
         dPa_name::ID_SCENE_END,
     },
diff --git a/src/d/d_shop.cpp b/src/d/d_shop.cpp
index 4bb5e53f0..5ddc2b878 100644
--- a/src/d/d_shop.cpp
+++ b/src/d/d_shop.cpp
@@ -87,21 +87,21 @@ ShopItems_c__ItemData shopItemData_green_bottle = {
 ShopItems_c__ItemData shopItemData_bomb10 = {
     /* mItemNo           */ BOMB_10,
     /* mMustNotOwnItemNo */ BOMB_10,
-    /* mMustOwnItemNo    */ BOMB_BAG,
+    /* mMustOwnItemNo    */ dItem_BOMB_BAG_e,
     /* mBuyConditions    */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e,
 };
 
 ShopItems_c__ItemData shopItemData_bomb20 = {
     /* mItemNo           */ BOMB_20,
     /* mMustNotOwnItemNo */ BOMB_20,
-    /* mMustOwnItemNo    */ BOMB_BAG,
+    /* mMustOwnItemNo    */ dItem_BOMB_BAG_e,
     /* mBuyConditions    */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e,
 };
 
 ShopItems_c__ItemData shopItemData_bomb30 = {
     /* mItemNo           */ BOMB_30,
     /* mMustNotOwnItemNo */ BOMB_30,
-    /* mMustOwnItemNo    */ BOMB_BAG,
+    /* mMustOwnItemNo    */ dItem_BOMB_BAG_e,
     /* mBuyConditions    */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MAXIMUM_e,
 };
 
@@ -113,8 +113,8 @@ ShopItems_c__ItemData shopItemData_emptybottle = {
 };
 
 ShopItems_c__ItemData shopItemData_kakera_heart = {
-    /* mItemNo           */ KAKERA_HEART,
-    /* mMustNotOwnItemNo */ KAKERA_HEART,
+    /* mItemNo           */ dItem_HEART_PIECE_e,
+    /* mMustNotOwnItemNo */ dItem_HEART_PIECE_e,
     /* mMustOwnItemNo    */ -1,
     /* mBuyConditions    */ Shop_BuyCond_RUPEES_e | Shop_BuyCond_MUST_NOT_OWN_ITEM_e,
 };
diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp
index cfd96bbc4..7d68625f4 100644
--- a/src/f_op/f_op_actor_mng.cpp
+++ b/src/f_op/f_op_actor_mng.cpp
@@ -940,10 +940,10 @@ uint fopAcM_createDemoItem(cXyz* pos, int i_itemNo, int i_itemBitNo, csXyz* rot,
 uint fopAcM_createItemForBoss(cXyz* pos, int, int roomNo, csXyz* rot, cXyz* scale, int param_6) {
     switch (param_6) {
     case 1:
-        return fopAcM_createItem(pos, UTUWA_HEART, -1, roomNo, 3, rot, 0xC, scale);
+        return fopAcM_createItem(pos, dItem_HEART_CONTAINER_e, -1, roomNo, 3, rot, 0xC, scale);
     case 0:
     default:
-        return fopAcM_createItem(pos, UTUWA_HEART, -1, roomNo, 3, rot, 5, scale);
+        return fopAcM_createItem(pos, dItem_HEART_CONTAINER_e, -1, roomNo, 3, rot, 5, scale);
     }
 }
 
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index ce3f08e82..83d7f2951 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -39,7 +39,7 @@ static struct {
     /* 0x0A */ {dItem_MAGIC_ARMOR_e, "shield_02.bti"},
     /* 0x0B */ {ESA_BAG, "coverofbait.bti"},
     /* 0x0C */ {dItem_BOW_e, "bow_01.bti"},
-    /* 0x0D */ {BOMB_BAG, "bomb_00.bti"},
+    /* 0x0D */ {dItem_BOMB_BAG_e, "bomb_00.bti"},
     /* 0x0E */ {EMPTY_BOTTLE, "bottle_00.bti"},
     /* 0x0F */ {RED_BOTTLE, "bottle_01.bti"},
     /* 0x10 */ {GREEN_BOTTLE, "bottle_02.bti"},