From 1e25c049363c7882f82414b0f10b9d523c5f2708 Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Thu, 24 Feb 2022 19:40:13 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#2233=20name2=E3=82=92ego=5Fidx?=
 =?utf8?q?=E3=81=AB=E6=94=B9=E5=90=8D=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/action/activation-execution.cpp                |  2 +-
 src/artifact/artifact-info.cpp                     |  4 +-
 src/artifact/random-art-generator.cpp              |  2 +-
 src/autopick/autopick-destroyer.cpp                |  2 +-
 src/autopick/autopick-entry.cpp                    |  2 +-
 src/birth/inventory-initializer.cpp                |  2 +-
 src/dungeon/quest-completion-checker.cpp           |  2 +-
 src/flavor/flavor-describer.cpp                    |  2 +-
 src/flavor/flavor-util.cpp                         |  2 +-
 src/flavor/named-item-describer.cpp                |  4 +-
 src/floor/floor-events.cpp                         |  2 +-
 src/load/old/item-flag-types-savefile50.h          |  2 +-
 src/load/old/item-loader-savefile50.cpp            |  6 +-
 src/load/old/load-v1-5-0.cpp                       | 12 ++--
 src/mind/mind-chaos-warrior.cpp                    |  2 +-
 src/object-enchant/object-ego.cpp                  | 12 ++--
 src/object-enchant/others/apply-magic-amulet.cpp   | 58 ++++++++--------
 src/object-enchant/others/apply-magic-lite.cpp     |  8 +--
 src/object-enchant/others/apply-magic-ring.cpp     | 80 +++++++++++-----------
 src/object-enchant/protector/apply-magic-armor.cpp | 10 +--
 src/object-enchant/protector/apply-magic-boots.cpp |  4 +-
 src/object-enchant/protector/apply-magic-cloak.cpp |  4 +-
 src/object-enchant/protector/apply-magic-crown.cpp |  8 +--
 .../protector/apply-magic-gloves.cpp               |  4 +-
 src/object-enchant/protector/apply-magic-helm.cpp  |  8 +--
 .../protector/apply-magic-shield.cpp               |  8 +--
 src/object-enchant/weapon/apply-magic-weapon.cpp   | 22 +++---
 src/object/lite-processor.cpp                      |  4 +-
 src/object/object-flags.cpp                        |  8 +--
 src/object/object-value-calc.cpp                   |  2 +-
 src/object/object-value.cpp                        |  2 +-
 src/perception/identification.cpp                  |  4 +-
 src/racial/racial-android.cpp                      |  2 +-
 src/save/item-writer.cpp                           |  6 +-
 src/specific-object/torch.cpp                      |  2 +-
 src/spell-realm/spells-craft.cpp                   |  2 +-
 src/spell/spells-object.cpp                        | 44 ++++++------
 src/store/store-util.cpp                           |  2 +-
 src/system/object-type-definition.cpp              |  4 +-
 src/system/object-type-definition.h                |  2 +-
 src/wizard/artifact-analyzer.cpp                   |  2 +-
 src/wizard/wizard-item-modifier.cpp                |  6 +-
 42 files changed, 183 insertions(+), 183 deletions(-)

diff --git a/src/action/activation-execution.cpp b/src/action/activation-execution.cpp
index ad9b4af7c..610e45cc5 100644
--- a/src/action/activation-execution.cpp
+++ b/src/action/activation-execution.cpp
@@ -65,7 +65,7 @@ static void decide_activation_level(ae_type *ae_ptr)
     }
 
     if (((ae_ptr->o_ptr->tval == ItemKindType::RING) || (ae_ptr->o_ptr->tval == ItemKindType::AMULET)) && ae_ptr->o_ptr->is_ego())
-        ae_ptr->lev = e_info[ae_ptr->o_ptr->name2].level;
+        ae_ptr->lev = e_info[ae_ptr->o_ptr->ego_idx].level;
 }
 
 static void decide_chance_fail(PlayerType *player_ptr, ae_type *ae_ptr)
diff --git a/src/artifact/artifact-info.cpp b/src/artifact/artifact-info.cpp
index 1f5a6f6ab..3c4839174 100644
--- a/src/artifact/artifact-info.cpp
+++ b/src/artifact/artifact-info.cpp
@@ -31,8 +31,8 @@ RandomArtActType activation_index(const ObjectType *o_ptr)
     if (o_ptr->is_fixed_artifact() && a_info[o_ptr->fixed_artifact_idx].flags.has(TR_ACTIVATE))
         return a_info[o_ptr->fixed_artifact_idx].act_idx;
 
-    if (o_ptr->is_ego() && e_info[o_ptr->name2].flags.has(TR_ACTIVATE))
-        return e_info[o_ptr->name2].act_idx;
+    if (o_ptr->is_ego() && e_info[o_ptr->ego_idx].flags.has(TR_ACTIVATE))
+        return e_info[o_ptr->ego_idx].act_idx;
 
     if (!o_ptr->is_random_artifact() && k_info[o_ptr->k_idx].flags.has(TR_ACTIVATE))
         return k_info[o_ptr->k_idx].act_idx;
diff --git a/src/artifact/random-art-generator.cpp b/src/artifact/random-art-generator.cpp
index a22148931..c4d5fcb50 100644
--- a/src/artifact/random-art-generator.cpp
+++ b/src/artifact/random-art-generator.cpp
@@ -401,7 +401,7 @@ bool become_random_artifact(PlayerType *player_ptr, ObjectType *o_ptr, bool a_sc
 {
     o_ptr->artifact_bias = 0;
     o_ptr->fixed_artifact_idx = 0;
-    o_ptr->name2 = EgoType::NONE;
+    o_ptr->ego_idx = EgoType::NONE;
     o_ptr->art_flags |= k_info[o_ptr->k_idx].flags;
 
     bool has_pval = o_ptr->pval != 0;
diff --git a/src/autopick/autopick-destroyer.cpp b/src/autopick/autopick-destroyer.cpp
index d74f48e6a..a39a86f0a 100644
--- a/src/autopick/autopick-destroyer.cpp
+++ b/src/autopick/autopick-destroyer.cpp
@@ -52,7 +52,7 @@ static bool is_leave_special_item(PlayerType *player_ptr, ObjectType *o_ptr)
         if (o_ptr->tval == ItemKindType::SKELETON || (o_ptr->tval == ItemKindType::CORPSE && o_ptr->sval == SV_SKELETON))
             return false;
     } else if (pc.equals(PlayerClassType::NINJA)) {
-        if (o_ptr->tval == ItemKindType::LITE && o_ptr->name2 == EgoType::LITE_DARKNESS && o_ptr->is_known())
+        if (o_ptr->tval == ItemKindType::LITE && o_ptr->ego_idx == EgoType::LITE_DARKNESS && o_ptr->is_known())
             return false;
     } else if (pc.is_tamer()) {
         if (o_ptr->tval == ItemKindType::WAND && o_ptr->sval == SV_WAND_HEAL_MONSTER && o_ptr->is_aware())
diff --git a/src/autopick/autopick-entry.cpp b/src/autopick/autopick-entry.cpp
index 960ab7d99..7e3d1a6b6 100644
--- a/src/autopick/autopick-entry.cpp
+++ b/src/autopick/autopick-entry.cpp
@@ -347,7 +347,7 @@ void autopick_entry_from_object(PlayerType *player_ptr, autopick_type *entry, Ob
                  * are almost meaningless.
                  * Register the ego type only.
                  */
-                auto *e_ptr = &e_info[o_ptr->name2];
+                auto *e_ptr = &e_info[o_ptr->ego_idx];
 #ifdef JP
                 /* エゴ銘には「^」マークが使える */
                 sprintf(name_str, "^%s", e_ptr->name.c_str());
diff --git a/src/birth/inventory-initializer.cpp b/src/birth/inventory-initializer.cpp
index 219e375e0..137941654 100644
--- a/src/birth/inventory-initializer.cpp
+++ b/src/birth/inventory-initializer.cpp
@@ -268,7 +268,7 @@ void player_outfit(PlayerType *player_ptr)
 
         /* Only assassins get a poisoned weapon */
         if (((tv == ItemKindType::SWORD) || (tv == ItemKindType::HAFTED)) && (pc.equals(PlayerClassType::ROGUE) && (player_ptr->realm1 == REALM_DEATH))) {
-            q_ptr->name2 = EgoType::BRAND_POIS;
+            q_ptr->ego_idx = EgoType::BRAND_POIS;
         }
         
         add_outfit(player_ptr, q_ptr);
diff --git a/src/dungeon/quest-completion-checker.cpp b/src/dungeon/quest-completion-checker.cpp
index 013b492a9..69f831f88 100644
--- a/src/dungeon/quest-completion-checker.cpp
+++ b/src/dungeon/quest-completion-checker.cpp
@@ -277,6 +277,6 @@ bool QuestCompletionChecker::check_quality(ObjectType &item)
 {
     auto is_good_reward = !item.is_cursed();
     is_good_reward &= !item.is_ammo() || (item.is_ammo() && item.is_fixed_artifact());
-    is_good_reward &= item.name2 != EgoType::DIGGING;
+    is_good_reward &= item.ego_idx != EgoType::DIGGING;
     return is_good_reward;
 }
diff --git a/src/flavor/flavor-describer.cpp b/src/flavor/flavor-describer.cpp
index 578f35a7c..a3c7e922c 100644
--- a/src/flavor/flavor-describer.cpp
+++ b/src/flavor/flavor-describer.cpp
@@ -438,7 +438,7 @@ static void describe_lamp_life(flavor_type *flavor_ptr)
         return;
 
     flavor_ptr->t = object_desc_str(flavor_ptr->t, _("(", " (with "));
-    auto fuel_magnification = flavor_ptr->o_ptr->name2 == EgoType::LITE_LONG ? 2 : 1;
+    auto fuel_magnification = flavor_ptr->o_ptr->ego_idx == EgoType::LITE_LONG ? 2 : 1;
     flavor_ptr->t = object_desc_num(flavor_ptr->t, fuel_magnification * flavor_ptr->o_ptr->fuel);
     flavor_ptr->t = object_desc_str(flavor_ptr->t, _("ターンの寿命)", " turns of light)"));
 }
diff --git a/src/flavor/flavor-util.cpp b/src/flavor/flavor-util.cpp
index e1abf90d0..dffa00378 100644
--- a/src/flavor/flavor-util.cpp
+++ b/src/flavor/flavor-util.cpp
@@ -193,7 +193,7 @@ char *get_ability_abbreviation(char *short_flavor, ObjectType *o_ptr, bool kanji
         }
 
         if (o_ptr->is_ego()) {
-            auto *e_ptr = &e_info[o_ptr->name2];
+            auto *e_ptr = &e_info[o_ptr->ego_idx];
             flgs.reset(e_ptr->flags);
         }
     }
diff --git a/src/flavor/named-item-describer.cpp b/src/flavor/named-item-describer.cpp
index 8ee4722c0..e1bd5408e 100644
--- a/src/flavor/named-item-describer.cpp
+++ b/src/flavor/named-item-describer.cpp
@@ -120,7 +120,7 @@ static void describe_artifact_ja(flavor_type *flavor_ptr)
     }
 
     if (flavor_ptr->o_ptr->is_ego()) {
-        auto *e_ptr = &e_info[flavor_ptr->o_ptr->name2];
+        auto *e_ptr = &e_info[flavor_ptr->o_ptr->ego_idx];
         flavor_ptr->t = object_desc_str(flavor_ptr->t, e_ptr->name.c_str());
     }
 }
@@ -298,7 +298,7 @@ static void describe_artifact_body_en(flavor_type *flavor_ptr)
     }
 
     if (flavor_ptr->o_ptr->is_ego()) {
-        auto *e_ptr = &e_info[flavor_ptr->o_ptr->name2];
+        auto *e_ptr = &e_info[flavor_ptr->o_ptr->ego_idx];
         flavor_ptr->t = object_desc_chr(flavor_ptr->t, ' ');
         flavor_ptr->t = object_desc_str(flavor_ptr->t, e_ptr->name.c_str());
     }
diff --git a/src/floor/floor-events.cpp b/src/floor/floor-events.cpp
index 36178752e..59dd14f55 100644
--- a/src/floor/floor-events.cpp
+++ b/src/floor/floor-events.cpp
@@ -150,7 +150,7 @@ static byte get_dungeon_feeling(PlayerType *player_ptr)
             continue;
 
         if (o_ptr->is_ego()) {
-            auto *e_ptr = &e_info[o_ptr->name2];
+            auto *e_ptr = &e_info[o_ptr->ego_idx];
             delta += e_ptr->rating * base;
         }
 
diff --git a/src/load/old/item-flag-types-savefile50.h b/src/load/old/item-flag-types-savefile50.h
index 733b4ff8b..464d6bb02 100644
--- a/src/load/old/item-flag-types-savefile50.h
+++ b/src/load/old/item-flag-types-savefile50.h
@@ -5,7 +5,7 @@ enum class SaveDataItemFlagType : unsigned int {
 	DISCOUNT = 0x00000002,
 	NUMBER = 0x00000004,
 	FIXED_ARTIFACT_IDX = 0x00000008,
-	NAME2 = 0x00000010,
+	EGO_IDX = 0x00000010,
 	TIMEOUT = 0x00000020,
 	TO_H = 0x00000040,
 	TO_D = 0x00000080,
diff --git a/src/load/old/item-loader-savefile50.cpp b/src/load/old/item-loader-savefile50.cpp
index 9dc4f463c..5b93faf3d 100644
--- a/src/load/old/item-loader-savefile50.cpp
+++ b/src/load/old/item-loader-savefile50.cpp
@@ -50,7 +50,7 @@ void ItemLoader50::rd_item(ObjectType *o_ptr)
         o_ptr->fixed_artifact_idx = 0;
     }
 
-    o_ptr->name2 = i2enum<EgoType>(any_bits(flags, SaveDataItemFlagType::NAME2) ? rd_byte() : 0);
+    o_ptr->ego_idx = i2enum<EgoType>(any_bits(flags, SaveDataItemFlagType::EGO_IDX) ? rd_byte() : 0);
     o_ptr->timeout = any_bits(flags, SaveDataItemFlagType::TIMEOUT) ? rd_s16b() : 0;
     o_ptr->to_h = any_bits(flags, SaveDataItemFlagType::TO_H) ? rd_s16b() : 0;
     o_ptr->to_d = any_bits(flags, SaveDataItemFlagType::TO_D) ? rd_s16b() : 0;
@@ -181,7 +181,7 @@ void ItemLoader50::rd_item(ObjectType *o_ptr)
         return;
     }
 
-    if ((o_ptr->name2 == EgoType::DARK) || (o_ptr->name2 == EgoType::ANCIENT_CURSE) || (o_ptr->fixed_artifact_idx == ART_NIGHT)) {
+    if ((o_ptr->ego_idx == EgoType::DARK) || (o_ptr->ego_idx == EgoType::ANCIENT_CURSE) || (o_ptr->fixed_artifact_idx == ART_NIGHT)) {
         o_ptr->art_flags.set(TR_LITE_M1);
         o_ptr->art_flags.reset(TR_LITE_1);
         o_ptr->art_flags.reset(TR_LITE_2);
@@ -189,7 +189,7 @@ void ItemLoader50::rd_item(ObjectType *o_ptr)
         return;
     }
 
-    if (o_ptr->name2 == EgoType::LITE_DARKNESS) {
+    if (o_ptr->ego_idx == EgoType::LITE_DARKNESS) {
         if (o_ptr->tval != ItemKindType::LITE) {
             o_ptr->art_flags.set(TR_LITE_M1);
             return;
diff --git a/src/load/old/load-v1-5-0.cpp b/src/load/old/load-v1-5-0.cpp
index 7a8250098..361c16950 100644
--- a/src/load/old/load-v1-5-0.cpp
+++ b/src/load/old/load-v1-5-0.cpp
@@ -90,7 +90,7 @@ void rd_item_old(ObjectType *o_ptr)
 
     o_ptr->fixed_artifact_idx = rd_byte();
 
-    o_ptr->name2 = i2enum<EgoType>(rd_byte());
+    o_ptr->ego_idx = i2enum<EgoType>(rd_byte());
 
     o_ptr->timeout = rd_s16b();
     o_ptr->to_h = rd_s16b();
@@ -111,7 +111,7 @@ void rd_item_old(ObjectType *o_ptr)
     }
 
     if (h_older_than(1, 3, 0, 0)) {
-        if (o_ptr->name2 == EgoType::TELEPATHY)
+        if (o_ptr->ego_idx == EgoType::TELEPATHY)
             o_ptr->art_flags.set(TR_TELEPATHY);
     }
 
@@ -131,7 +131,7 @@ void rd_item_old(ObjectType *o_ptr)
                 if (a_ptr->gen_flags.has(ItemGenerationTraitType::PERMA_CURSE))
                     o_ptr->curse_flags.set(CurseTraitType::PERMA_CURSE);
             } else if (o_ptr->is_ego()) {
-                auto *e_ptr = &e_info[o_ptr->name2];
+                auto *e_ptr = &e_info[o_ptr->ego_idx];
                 if (e_ptr->gen_flags.has(ItemGenerationTraitType::HEAVY_CURSE))
                     o_ptr->curse_flags.set(CurseTraitType::HEAVY_CURSE);
                 if (e_ptr->gen_flags.has(ItemGenerationTraitType::PERMA_CURSE))
@@ -311,7 +311,7 @@ void rd_item_old(ObjectType *o_ptr)
     if ((o_ptr->k_idx >= 445) && (o_ptr->k_idx <= 479))
         return;
 
-    if (h_older_than(0, 4, 10) && (o_ptr->name2 == EgoType::TWILIGHT))
+    if (h_older_than(0, 4, 10) && (o_ptr->ego_idx == EgoType::TWILIGHT))
         o_ptr->k_idx = lookup_kind(ItemKindType::SOFT_ARMOR, SV_TWILIGHT_ROBE);
 
     if (h_older_than(0, 4, 9)) {
@@ -329,9 +329,9 @@ void rd_item_old(ObjectType *o_ptr)
     }
 
     if (o_ptr->is_ego()) {
-        auto *e_ptr = &e_info[o_ptr->name2];
+        auto *e_ptr = &e_info[o_ptr->ego_idx];
         if (e_ptr->name.empty())
-            o_ptr->name2 = EgoType::NONE;
+            o_ptr->ego_idx = EgoType::NONE;
     }
 }
 
diff --git a/src/mind/mind-chaos-warrior.cpp b/src/mind/mind-chaos-warrior.cpp
index d55e9d2b0..0f0248eec 100644
--- a/src/mind/mind-chaos-warrior.cpp
+++ b/src/mind/mind-chaos-warrior.cpp
@@ -116,6 +116,6 @@ void acquire_chaos_weapon(PlayerType *player_ptr)
     q_ptr->to_h = 3 + randint1(player_ptr->current_floor_ptr->dun_level) % 10;
     q_ptr->to_d = 3 + randint1(player_ptr->current_floor_ptr->dun_level) % 10;
     one_resistance(q_ptr);
-    q_ptr->name2 = EgoType::CHAOTIC;
+    q_ptr->ego_idx = EgoType::CHAOTIC;
     (void)drop_near(player_ptr, q_ptr, -1, player_ptr->y, player_ptr->x);
 }
diff --git a/src/object-enchant/object-ego.cpp b/src/object-enchant/object-ego.cpp
index 4f1bbb984..16b0f66fa 100644
--- a/src/object-enchant/object-ego.cpp
+++ b/src/object-enchant/object-ego.cpp
@@ -204,7 +204,7 @@ void ego_invest_extra_attack(ObjectType *o_ptr, ego_item_type *e_ptr, DEPTH lev)
         return;
     }
 
-    if (o_ptr->name2 == EgoType::ATTACKS) {
+    if (o_ptr->ego_idx == EgoType::ATTACKS) {
         o_ptr->pval = randint1(e_ptr->max_pval * lev / 100 + 1);
         if (o_ptr->pval > 3)
             o_ptr->pval = 3;
@@ -236,7 +236,7 @@ void ego_invest_extra_attack(ObjectType *o_ptr, ego_item_type *e_ptr, DEPTH lev)
  */
 void apply_ego(ObjectType *o_ptr, DEPTH lev)
 {
-    auto e_ptr = &e_info[o_ptr->name2];
+    auto e_ptr = &e_info[o_ptr->ego_idx];
     auto gen_flags = e_ptr->gen_flags;
 
     ego_interpret_extra_abilities(o_ptr, e_ptr, gen_flags);
@@ -295,12 +295,12 @@ void apply_ego(ObjectType *o_ptr, DEPTH lev)
             o_ptr->to_d = std::max(o_ptr->to_d, 15);
         }
 
-        if ((o_ptr->name2 == EgoType::PROTECTION) || (o_ptr->name2 == EgoType::S_PROTECTION) || (o_ptr->name2 == EgoType::H_PROTECTION)) {
+        if ((o_ptr->ego_idx == EgoType::PROTECTION) || (o_ptr->ego_idx == EgoType::S_PROTECTION) || (o_ptr->ego_idx == EgoType::H_PROTECTION)) {
             o_ptr->to_a = std::max<short>(o_ptr->to_a, 15);
         }
 
         if (e_ptr->max_pval) {
-            if (o_ptr->name2 == EgoType::BAT) {
+            if (o_ptr->ego_idx == EgoType::BAT) {
                 o_ptr->pval = randint1(e_ptr->max_pval);
                 if (o_ptr->sval == SV_ELVEN_CLOAK)
                     o_ptr->pval += randint1(2);
@@ -318,11 +318,11 @@ void apply_ego(ObjectType *o_ptr, DEPTH lev)
             }
         }
 
-        if ((o_ptr->name2 == EgoType::SPEED) && (lev < 50)) {
+        if ((o_ptr->ego_idx == EgoType::SPEED) && (lev < 50)) {
             o_ptr->pval = randint1(o_ptr->pval);
         }
 
-        if ((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_HAYABUSA) && (o_ptr->pval > 2) && (o_ptr->name2 != EgoType::ATTACKS))
+        if ((o_ptr->tval == ItemKindType::SWORD) && (o_ptr->sval == SV_HAYABUSA) && (o_ptr->pval > 2) && (o_ptr->ego_idx != EgoType::ATTACKS))
             o_ptr->pval = 2;
     }
 }
diff --git a/src/object-enchant/others/apply-magic-amulet.cpp b/src/object-enchant/others/apply-magic-amulet.cpp
index 3bfe3ccf8..4ebc9409a 100644
--- a/src/object-enchant/others/apply-magic-amulet.cpp
+++ b/src/object-enchant/others/apply-magic-amulet.cpp
@@ -160,7 +160,7 @@ void AmuletEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_SLOW_D;
+            this->o_ptr->ego_idx = EgoType::AMU_SLOW_D;
             break;
         case 3:
         case 4:
@@ -168,7 +168,7 @@ void AmuletEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_INFRA;
+            this->o_ptr->ego_idx = EgoType::AMU_INFRA;
             break;
         case 5:
         case 6:
@@ -176,7 +176,7 @@ void AmuletEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_SEE_INVIS;
+            this->o_ptr->ego_idx = EgoType::AMU_SEE_INVIS;
             break;
         case 7:
         case 8:
@@ -184,19 +184,19 @@ void AmuletEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_HOLD_EXP;
+            this->o_ptr->ego_idx = EgoType::AMU_HOLD_EXP;
             break;
         case 9:
             if (k_ptr->flags.has(TR_LEVITATION)) {
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_LEVITATION;
+            this->o_ptr->ego_idx = EgoType::AMU_LEVITATION;
             break;
         case 10:
         case 11:
         case 21:
-            this->o_ptr->name2 = EgoType::AMU_AC;
+            this->o_ptr->ego_idx = EgoType::AMU_AC;
             break;
         case 12:
             if (k_ptr->flags.has(TR_RES_FIRE)) {
@@ -204,11 +204,11 @@ void AmuletEnchanter::give_ego_index()
             }
 
             if (m_bonus(10, this->level) > 8) {
-                this->o_ptr->name2 = EgoType::AMU_RES_FIRE_;
+                this->o_ptr->ego_idx = EgoType::AMU_RES_FIRE_;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_RES_FIRE;
+            this->o_ptr->ego_idx = EgoType::AMU_RES_FIRE;
             break;
         case 13:
             if (k_ptr->flags.has(TR_RES_COLD)) {
@@ -216,11 +216,11 @@ void AmuletEnchanter::give_ego_index()
             }
 
             if (m_bonus(10, this->level) > 8) {
-                this->o_ptr->name2 = EgoType::AMU_RES_COLD_;
+                this->o_ptr->ego_idx = EgoType::AMU_RES_COLD_;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_RES_COLD;
+            this->o_ptr->ego_idx = EgoType::AMU_RES_COLD;
             break;
         case 14:
             if (k_ptr->flags.has(TR_RES_ELEC)) {
@@ -228,11 +228,11 @@ void AmuletEnchanter::give_ego_index()
             }
 
             if (m_bonus(10, this->level) > 8) {
-                this->o_ptr->name2 = EgoType::AMU_RES_ELEC_;
+                this->o_ptr->ego_idx = EgoType::AMU_RES_ELEC_;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_RES_ELEC;
+            this->o_ptr->ego_idx = EgoType::AMU_RES_ELEC;
             break;
         case 15:
             if (k_ptr->flags.has(TR_RES_ACID)) {
@@ -240,11 +240,11 @@ void AmuletEnchanter::give_ego_index()
             }
 
             if (m_bonus(10, this->level) > 8) {
-                this->o_ptr->name2 = EgoType::AMU_RES_ACID_;
+                this->o_ptr->ego_idx = EgoType::AMU_RES_ACID_;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_RES_ACID;
+            this->o_ptr->ego_idx = EgoType::AMU_RES_ACID;
             break;
         case 16:
         case 17:
@@ -262,60 +262,60 @@ void AmuletEnchanter::give_high_ego_index()
     switch (this->o_ptr->sval) {
     case SV_AMULET_TELEPORT:
         if (m_bonus(10, this->level) > 9) {
-            this->o_ptr->name2 = EgoType::AMU_D_DOOR;
+            this->o_ptr->ego_idx = EgoType::AMU_D_DOOR;
             break;
         }
 
         if (one_in_(2)) {
-            this->o_ptr->name2 = EgoType::AMU_JUMP;
+            this->o_ptr->ego_idx = EgoType::AMU_JUMP;
             break;
         }
 
-        this->o_ptr->name2 = EgoType::AMU_TELEPORT;
+        this->o_ptr->ego_idx = EgoType::AMU_TELEPORT;
         break;
     case SV_AMULET_RESIST_ACID:
         if ((m_bonus(10, this->level) > 6) && one_in_(2)) {
-            this->o_ptr->name2 = EgoType::AMU_RES_ACID_;
+            this->o_ptr->ego_idx = EgoType::AMU_RES_ACID_;
         }
 
         break;
     case SV_AMULET_SEARCHING:
-        this->o_ptr->name2 = EgoType::AMU_STEALTH;
+        this->o_ptr->ego_idx = EgoType::AMU_STEALTH;
         break;
     case SV_AMULET_BRILLIANCE:
         if (!one_in_(3)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::AMU_IDENT;
+        this->o_ptr->ego_idx = EgoType::AMU_IDENT;
         break;
     case SV_AMULET_CHARISMA:
         if (!one_in_(3)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::AMU_CHARM;
+        this->o_ptr->ego_idx = EgoType::AMU_CHARM;
         break;
     case SV_AMULET_THE_MAGI:
         if (one_in_(2)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::AMU_GREAT;
+        this->o_ptr->ego_idx = EgoType::AMU_GREAT;
         break;
     case SV_AMULET_RESISTANCE:
         if (!one_in_(5)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::AMU_DEFENDER;
+        this->o_ptr->ego_idx = EgoType::AMU_DEFENDER;
         break;
     case SV_AMULET_TELEPATHY:
         if (!one_in_(3)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::AMU_DETECTION;
+        this->o_ptr->ego_idx = EgoType::AMU_DETECTION;
         break;
     default:
         break;
@@ -348,27 +348,27 @@ void AmuletEnchanter::give_cursed()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_DRAIN_EXP;
+            this->o_ptr->ego_idx = EgoType::AMU_DRAIN_EXP;
             break;
         case 2:
-            this->o_ptr->name2 = EgoType::AMU_FOOL;
+            this->o_ptr->ego_idx = EgoType::AMU_FOOL;
             break;
         case 3:
             if (k_ptr->flags.has(TR_AGGRAVATE)) {
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_AGGRAVATE;
+            this->o_ptr->ego_idx = EgoType::AMU_AGGRAVATE;
             break;
         case 4:
             if (k_ptr->flags.has(TR_TY_CURSE)) {
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::AMU_TY_CURSE;
+            this->o_ptr->ego_idx = EgoType::AMU_TY_CURSE;
             break;
         case 5:
-            this->o_ptr->name2 = EgoType::AMU_NAIVETY;
+            this->o_ptr->ego_idx = EgoType::AMU_NAIVETY;
             break;
         }
     }
diff --git a/src/object-enchant/others/apply-magic-lite.cpp b/src/object-enchant/others/apply-magic-lite.cpp
index d7ecae795..32c23bc63 100644
--- a/src/object-enchant/others/apply-magic-lite.cpp
+++ b/src/object-enchant/others/apply-magic-lite.cpp
@@ -55,8 +55,8 @@ void LiteEnchanter::give_ego_index()
 {
     while (true) {
         auto okay_flag = true;
-        this->o_ptr->name2 = get_random_ego(INVEN_LITE, true);
-        switch (this->o_ptr->name2) {
+        this->o_ptr->ego_idx = get_random_ego(INVEN_LITE, true);
+        switch (this->o_ptr->ego_idx) {
         case EgoType::LITE_LONG:
             if (this->o_ptr->sval == SV_LITE_FEANOR) {
                 okay_flag = false;
@@ -75,8 +75,8 @@ void LiteEnchanter::give_ego_index()
 
 void LiteEnchanter::give_cursed()
 {
-    this->o_ptr->name2 = get_random_ego(INVEN_LITE, false);
-    switch (this->o_ptr->name2) {
+    this->o_ptr->ego_idx = get_random_ego(INVEN_LITE, false);
+    switch (this->o_ptr->ego_idx) {
     case EgoType::LITE_DARKNESS:
         this->o_ptr->fuel = 0;
         this->add_dark_flag();
diff --git a/src/object-enchant/others/apply-magic-ring.cpp b/src/object-enchant/others/apply-magic-ring.cpp
index c179891f6..a07babd33 100644
--- a/src/object-enchant/others/apply-magic-ring.cpp
+++ b/src/object-enchant/others/apply-magic-ring.cpp
@@ -232,7 +232,7 @@ void RingEnchanter::give_ego_index()
         switch (randint1(28)) {
         case 1:
         case 2:
-            this->o_ptr->name2 = EgoType::RING_THROW;
+            this->o_ptr->ego_idx = EgoType::RING_THROW;
             break;
         case 3:
         case 4:
@@ -240,7 +240,7 @@ void RingEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_REGEN;
+            this->o_ptr->ego_idx = EgoType::RING_REGEN;
             break;
         case 5:
         case 6:
@@ -248,7 +248,7 @@ void RingEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_LITE;
+            this->o_ptr->ego_idx = EgoType::RING_LITE;
             break;
         case 7:
         case 8:
@@ -256,7 +256,7 @@ void RingEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_TELEPORT;
+            this->o_ptr->ego_idx = EgoType::RING_TELEPORT;
             break;
         case 9:
         case 10:
@@ -264,7 +264,7 @@ void RingEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_TO_H;
+            this->o_ptr->ego_idx = EgoType::RING_TO_H;
             break;
         case 11:
         case 12:
@@ -272,28 +272,28 @@ void RingEnchanter::give_ego_index()
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_TO_D;
+            this->o_ptr->ego_idx = EgoType::RING_TO_D;
             break;
         case 13:
             if ((this->o_ptr->to_h) || (this->o_ptr->to_d)) {
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_SLAY;
+            this->o_ptr->ego_idx = EgoType::RING_SLAY;
             break;
         case 14:
             if ((k_ptr->flags.has(TR_STR)) || this->o_ptr->to_h || this->o_ptr->to_d) {
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_WIZARD;
+            this->o_ptr->ego_idx = EgoType::RING_WIZARD;
             break;
         case 15:
             if (k_ptr->flags.has(TR_ACTIVATE)) {
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_HERO;
+            this->o_ptr->ego_idx = EgoType::RING_HERO;
             break;
         case 16:
             if (k_ptr->flags.has(TR_ACTIVATE)) {
@@ -301,16 +301,16 @@ void RingEnchanter::give_ego_index()
             }
 
             if (tmp > 8) {
-                this->o_ptr->name2 = EgoType::RING_MANA_BALL;
+                this->o_ptr->ego_idx = EgoType::RING_MANA_BALL;
                 break;
             }
 
             if (tmp > 4) {
-                this->o_ptr->name2 = EgoType::RING_MANA_BOLT;
+                this->o_ptr->ego_idx = EgoType::RING_MANA_BOLT;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_MAGIC_MIS;
+            this->o_ptr->ego_idx = EgoType::RING_MAGIC_MIS;
             break;
         case 17:
             if (k_ptr->flags.has(TR_ACTIVATE)) {
@@ -322,16 +322,16 @@ void RingEnchanter::give_ego_index()
             }
 
             if (tmp > 7) {
-                this->o_ptr->name2 = EgoType::RING_DRAGON_F;
+                this->o_ptr->ego_idx = EgoType::RING_DRAGON_F;
                 break;
             }
 
             if (tmp > 3) {
-                this->o_ptr->name2 = EgoType::RING_FIRE_BALL;
+                this->o_ptr->ego_idx = EgoType::RING_FIRE_BALL;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_FIRE_BOLT;
+            this->o_ptr->ego_idx = EgoType::RING_FIRE_BOLT;
             break;
         case 18:
             if (k_ptr->flags.has(TR_ACTIVATE)) {
@@ -343,16 +343,16 @@ void RingEnchanter::give_ego_index()
             }
 
             if (tmp > 7) {
-                this->o_ptr->name2 = EgoType::RING_DRAGON_C;
+                this->o_ptr->ego_idx = EgoType::RING_DRAGON_C;
                 break;
             }
 
             if (tmp > 3) {
-                this->o_ptr->name2 = EgoType::RING_COLD_BALL;
+                this->o_ptr->ego_idx = EgoType::RING_COLD_BALL;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_COLD_BOLT;
+            this->o_ptr->ego_idx = EgoType::RING_COLD_BOLT;
             break;
         case 19:
             if (k_ptr->flags.has(TR_ACTIVATE)) {
@@ -364,11 +364,11 @@ void RingEnchanter::give_ego_index()
             }
 
             if (tmp > 4) {
-                this->o_ptr->name2 = EgoType::RING_ELEC_BALL;
+                this->o_ptr->ego_idx = EgoType::RING_ELEC_BALL;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_ELEC_BOLT;
+            this->o_ptr->ego_idx = EgoType::RING_ELEC_BOLT;
             break;
         case 20:
             if (k_ptr->flags.has(TR_ACTIVATE)) {
@@ -380,11 +380,11 @@ void RingEnchanter::give_ego_index()
             }
 
             if (tmp > 4) {
-                this->o_ptr->name2 = EgoType::RING_ACID_BALL;
+                this->o_ptr->ego_idx = EgoType::RING_ACID_BALL;
                 break;
             }
 
-            this->o_ptr->name2 = EgoType::RING_ACID_BOLT;
+            this->o_ptr->ego_idx = EgoType::RING_ACID_BOLT;
             break;
         case 21:
         case 22:
@@ -406,7 +406,7 @@ void RingEnchanter::give_high_ego_index()
             break;
         }
 
-        this->o_ptr->name2 = EgoType::RING_D_SPEED;
+        this->o_ptr->ego_idx = EgoType::RING_D_SPEED;
         break;
     case SV_RING_DAMAGE:
     case SV_RING_ACCURACY:
@@ -416,36 +416,36 @@ void RingEnchanter::give_high_ego_index()
         }
 
         if (one_in_(2)) {
-            this->o_ptr->name2 = EgoType::RING_HERO;
+            this->o_ptr->ego_idx = EgoType::RING_HERO;
             break;
         }
 
-        this->o_ptr->name2 = EgoType::RING_BERSERKER;
+        this->o_ptr->ego_idx = EgoType::RING_BERSERKER;
         this->o_ptr->to_h -= 2 + randint1(4);
         this->o_ptr->to_d += 2 + randint1(4);
         break;
     case SV_RING_PROTECTION:
-        this->o_ptr->name2 = EgoType::RING_SUPER_AC;
+        this->o_ptr->ego_idx = EgoType::RING_SUPER_AC;
         this->o_ptr->to_a += 7 + m_bonus(5, this->level);
         break;
     case SV_RING_RES_FEAR:
-        this->o_ptr->name2 = EgoType::RING_HERO;
+        this->o_ptr->ego_idx = EgoType::RING_HERO;
         break;
     case SV_RING_SHOTS:
         if (one_in_(2)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::RING_HUNTER;
+        this->o_ptr->ego_idx = EgoType::RING_HUNTER;
         break;
     case SV_RING_SEARCHING:
-        this->o_ptr->name2 = EgoType::RING_STEALTH;
+        this->o_ptr->ego_idx = EgoType::RING_STEALTH;
         break;
     case SV_RING_TELEPORTATION:
-        this->o_ptr->name2 = EgoType::RING_TELE_AWAY;
+        this->o_ptr->ego_idx = EgoType::RING_TELE_AWAY;
         break;
     case SV_RING_RES_BLINDNESS:
-        this->o_ptr->name2 = one_in_(2) ? EgoType::RING_RES_LITE : EgoType::RING_RES_DARK;
+        this->o_ptr->ego_idx = one_in_(2) ? EgoType::RING_RES_LITE : EgoType::RING_RES_DARK;
         break;
     case SV_RING_LORDLY:
         if (!one_in_(20)) {
@@ -454,28 +454,28 @@ void RingEnchanter::give_high_ego_index()
 
         one_lordly_high_resistance(this->o_ptr);
         one_lordly_high_resistance(this->o_ptr);
-        this->o_ptr->name2 = EgoType::RING_TRUE;
+        this->o_ptr->ego_idx = EgoType::RING_TRUE;
         break;
     case SV_RING_FLAMES:
         if (one_in_(2)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::RING_DRAGON_F;
+        this->o_ptr->ego_idx = EgoType::RING_DRAGON_F;
         break;
     case SV_RING_ICE:
         if (one_in_(2)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::RING_DRAGON_C;
+        this->o_ptr->ego_idx = EgoType::RING_DRAGON_C;
         break;
     case SV_RING_WARNING:
         if (one_in_(2)) {
             break;
         }
 
-        this->o_ptr->name2 = EgoType::RING_M_DETECT;
+        this->o_ptr->ego_idx = EgoType::RING_M_DETECT;
         break;
     default:
         break;
@@ -506,23 +506,23 @@ void RingEnchanter::give_cursed()
         case 1:
             if (k_ptr->flags.has(TR_DRAIN_EXP))
                 break;
-            this->o_ptr->name2 = EgoType::RING_DRAIN_EXP;
+            this->o_ptr->ego_idx = EgoType::RING_DRAIN_EXP;
             break;
         case 2:
-            this->o_ptr->name2 = EgoType::RING_NO_MELEE;
+            this->o_ptr->ego_idx = EgoType::RING_NO_MELEE;
             break;
         case 3:
             if (k_ptr->flags.has(TR_AGGRAVATE))
                 break;
-            this->o_ptr->name2 = EgoType::RING_AGGRAVATE;
+            this->o_ptr->ego_idx = EgoType::RING_AGGRAVATE;
             break;
         case 4:
             if (k_ptr->flags.has(TR_TY_CURSE))
                 break;
-            this->o_ptr->name2 = EgoType::RING_TY_CURSE;
+            this->o_ptr->ego_idx = EgoType::RING_TY_CURSE;
             break;
         case 5:
-            this->o_ptr->name2 = EgoType::RING_ALBINO;
+            this->o_ptr->ego_idx = EgoType::RING_ALBINO;
             break;
         }
     }
diff --git a/src/object-enchant/protector/apply-magic-armor.cpp b/src/object-enchant/protector/apply-magic-armor.cpp
index b74937ac9..3cb7d4623 100644
--- a/src/object-enchant/protector/apply-magic-armor.cpp
+++ b/src/object-enchant/protector/apply-magic-armor.cpp
@@ -110,8 +110,8 @@ void ArmorEnchanter::give_ego_index()
 
     while (true) {
         auto valid = true;
-        this->o_ptr->name2 = get_random_ego(INVEN_BODY, true);
-        switch (this->o_ptr->name2) {
+        this->o_ptr->ego_idx = get_random_ego(INVEN_BODY, true);
+        switch (this->o_ptr->ego_idx) {
         case EgoType::DWARVEN:
             if (this->o_ptr->tval != ItemKindType::HARD_ARMOR) {
                 valid = false;
@@ -147,7 +147,7 @@ void ArmorEnchanter::give_high_ego_index()
 
     this->is_high_ego_generated = true;
     auto ego_robe = one_in_(5);
-    this->o_ptr->name2 = ego_robe ? EgoType::TWILIGHT : EgoType::PERMANENCE;
+    this->o_ptr->ego_idx = ego_robe ? EgoType::TWILIGHT : EgoType::PERMANENCE;
     if (!ego_robe) {
         return;
     }
@@ -161,8 +161,8 @@ void ArmorEnchanter::give_high_ego_index()
 
 void ArmorEnchanter::give_cursed()
 {
-    this->o_ptr->name2 = get_random_ego(INVEN_BODY, false);
-    switch (this->o_ptr->name2) {
+    this->o_ptr->ego_idx = get_random_ego(INVEN_BODY, false);
+    switch (this->o_ptr->ego_idx) {
     case EgoType::A_DEMON:
     case EgoType::A_MORGUL:
         return;
diff --git a/src/object-enchant/protector/apply-magic-boots.cpp b/src/object-enchant/protector/apply-magic-boots.cpp
index 00c4ff40e..17003ac03 100644
--- a/src/object-enchant/protector/apply-magic-boots.cpp
+++ b/src/object-enchant/protector/apply-magic-boots.cpp
@@ -44,11 +44,11 @@ void BootsEnchanter::apply_magic()
             return;
         }
 
-        this->o_ptr->name2 = get_random_ego(INVEN_FEET, true);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_FEET, true);
         return;
     }
 
     if (this->power < -1) {
-        this->o_ptr->name2 = get_random_ego(INVEN_FEET, false);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_FEET, false);
     }
 }
diff --git a/src/object-enchant/protector/apply-magic-cloak.cpp b/src/object-enchant/protector/apply-magic-cloak.cpp
index 0815c09f1..dc2a171b3 100644
--- a/src/object-enchant/protector/apply-magic-cloak.cpp
+++ b/src/object-enchant/protector/apply-magic-cloak.cpp
@@ -39,11 +39,11 @@ void CloakEnchanter::apply_magic()
             return;
         }
 
-        this->o_ptr->name2 = get_random_ego(INVEN_OUTER, true);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_OUTER, true);
         return;
     }
 
     if (this->power < -1) {
-        this->o_ptr->name2 = get_random_ego(INVEN_OUTER, false);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_OUTER, false);
     }
 }
diff --git a/src/object-enchant/protector/apply-magic-crown.cpp b/src/object-enchant/protector/apply-magic-crown.cpp
index 767ff49cf..23ee59052 100644
--- a/src/object-enchant/protector/apply-magic-crown.cpp
+++ b/src/object-enchant/protector/apply-magic-crown.cpp
@@ -47,8 +47,8 @@ void CrownEnchanter::give_ego_index()
     }
 
     while (true) {
-        this->o_ptr->name2 = get_random_ego(INVEN_HEAD, true);
-        switch (this->o_ptr->name2) {
+        this->o_ptr->ego_idx = get_random_ego(INVEN_HEAD, true);
+        switch (this->o_ptr->ego_idx) {
         case EgoType::TELEPATHY:
         case EgoType::MAGI:
         case EgoType::MIGHT:
@@ -71,8 +71,8 @@ void CrownEnchanter::give_ego_index()
 void CrownEnchanter::give_cursed()
 {
     while (true) {
-        this->o_ptr->name2 = get_random_ego(INVEN_HEAD, false);
-        switch (this->o_ptr->name2) {
+        this->o_ptr->ego_idx = get_random_ego(INVEN_HEAD, false);
+        switch (this->o_ptr->ego_idx) {
         case EgoType::H_DEMON:
             return;
         default:
diff --git a/src/object-enchant/protector/apply-magic-gloves.cpp b/src/object-enchant/protector/apply-magic-gloves.cpp
index b6a7fd976..4a002ed4d 100644
--- a/src/object-enchant/protector/apply-magic-gloves.cpp
+++ b/src/object-enchant/protector/apply-magic-gloves.cpp
@@ -44,11 +44,11 @@ void GlovesEnchanter::apply_magic()
             return;
         }
 
-        this->o_ptr->name2 = get_random_ego(INVEN_ARMS, true);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_ARMS, true);
         return;
     }
     
     if (this->power < -1) {
-        this->o_ptr->name2 = get_random_ego(INVEN_ARMS, false);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_ARMS, false);
     }
 }
diff --git a/src/object-enchant/protector/apply-magic-helm.cpp b/src/object-enchant/protector/apply-magic-helm.cpp
index e41a3f78e..22a6ec3fb 100644
--- a/src/object-enchant/protector/apply-magic-helm.cpp
+++ b/src/object-enchant/protector/apply-magic-helm.cpp
@@ -56,8 +56,8 @@ void HelmEnchanter::give_ego_index()
     }
 
     while (true) {
-        this->o_ptr->name2 = get_random_ego(INVEN_HEAD, true);
-        switch (this->o_ptr->name2) {
+        this->o_ptr->ego_idx = get_random_ego(INVEN_HEAD, true);
+        switch (this->o_ptr->ego_idx) {
         case EgoType::BRILLIANCE:
         case EgoType::DARK:
         case EgoType::INFRAVISION:
@@ -79,8 +79,8 @@ void HelmEnchanter::give_ego_index()
 void HelmEnchanter::give_cursed()
 {
     while (true) {
-        this->o_ptr->name2 = get_random_ego(INVEN_HEAD, false);
-        switch (this->o_ptr->name2) {
+        this->o_ptr->ego_idx = get_random_ego(INVEN_HEAD, false);
+        switch (this->o_ptr->ego_idx) {
         case EgoType::ANCIENT_CURSE:
             return;
         default:
diff --git a/src/object-enchant/protector/apply-magic-shield.cpp b/src/object-enchant/protector/apply-magic-shield.cpp
index fb31978a2..87ccbdaad 100644
--- a/src/object-enchant/protector/apply-magic-shield.cpp
+++ b/src/object-enchant/protector/apply-magic-shield.cpp
@@ -57,20 +57,20 @@ void ShieldEnchanter::apply_magic()
 void ShieldEnchanter::give_ego_index()
 {
     while (true) {
-        this->o_ptr->name2 = get_random_ego(INVEN_SUB_HAND, true);
+        this->o_ptr->ego_idx = get_random_ego(INVEN_SUB_HAND, true);
         auto is_metal = this->o_ptr->sval == SV_SMALL_METAL_SHIELD;
         is_metal |= this->o_ptr->sval == SV_LARGE_METAL_SHIELD;
-        if (!is_metal && (this->o_ptr->name2 == EgoType::S_DWARVEN)) {
+        if (!is_metal && (this->o_ptr->ego_idx == EgoType::S_DWARVEN)) {
             continue;
         }
 
         break;
     }
 
-    switch (this->o_ptr->name2) {
+    switch (this->o_ptr->ego_idx) {
     case EgoType::REFLECTION:
         if (this->o_ptr->sval == SV_MIRROR_SHIELD) {
-            this->o_ptr->name2 = EgoType::NONE;
+            this->o_ptr->ego_idx = EgoType::NONE;
         }
 
         return;
diff --git a/src/object-enchant/weapon/apply-magic-weapon.cpp b/src/object-enchant/weapon/apply-magic-weapon.cpp
index 414d57fed..9f6bb5ce8 100644
--- a/src/object-enchant/weapon/apply-magic-weapon.cpp
+++ b/src/object-enchant/weapon/apply-magic-weapon.cpp
@@ -48,7 +48,7 @@ void WeaponEnchanter::apply_magic()
             if ((this->power > 2) || one_in_(30))
                 become_random_artifact(this->player_ptr, this->o_ptr, false);
             else
-                this->o_ptr->name2 = EgoType::DIGGING;
+                this->o_ptr->ego_idx = EgoType::DIGGING;
         } else if (this->power < -1) {
             this->o_ptr->pval = 0 - (5 + randint1(5));
         } else if (this->power < 0) {
@@ -67,19 +67,19 @@ void WeaponEnchanter::apply_magic()
             }
 
             while (true) {
-                this->o_ptr->name2 = get_random_ego(INVEN_MAIN_HAND, true);
-                if (this->o_ptr->name2 == EgoType::SHARPNESS && this->o_ptr->tval != ItemKindType::SWORD) {
+                this->o_ptr->ego_idx = get_random_ego(INVEN_MAIN_HAND, true);
+                if (this->o_ptr->ego_idx == EgoType::SHARPNESS && this->o_ptr->tval != ItemKindType::SWORD) {
                     continue;
                 }
 
-                if (this->o_ptr->name2 == EgoType::EARTHQUAKES && this->o_ptr->tval != ItemKindType::HAFTED) {
+                if (this->o_ptr->ego_idx == EgoType::EARTHQUAKES && this->o_ptr->tval != ItemKindType::HAFTED) {
                     continue;
                 }
 
                 break;
             }
 
-            switch (this->o_ptr->name2) {
+            switch (this->o_ptr->ego_idx) {
             case EgoType::SHARPNESS:
                 this->o_ptr->pval = (PARAMETER_VALUE)m_bonus(5, this->level) + 1;
                 break;
@@ -112,12 +112,12 @@ void WeaponEnchanter::apply_magic()
             if (randint0(MAX_DEPTH) < this->level) {
                 auto n = 0;
                 while (true) {
-                    this->o_ptr->name2 = get_random_ego(INVEN_MAIN_HAND, false);
-                    if (this->o_ptr->name2 == EgoType::WEIRD && this->o_ptr->tval != ItemKindType::SWORD) {
+                    this->o_ptr->ego_idx = get_random_ego(INVEN_MAIN_HAND, false);
+                    if (this->o_ptr->ego_idx == EgoType::WEIRD && this->o_ptr->tval != ItemKindType::SWORD) {
                         continue;
                     }
 
-                    auto *e_ptr = &e_info[this->o_ptr->name2];
+                    auto *e_ptr = &e_info[this->o_ptr->ego_idx];
                     if (this->o_ptr->tval == ItemKindType::SWORD && this->o_ptr->sval == SV_HAYABUSA && e_ptr->max_pval < 0) {
                         if (++n > 1000) {
                             msg_print(_("エラー:隼の剣に割り当てるエゴ無し", "Error: Cannot find for Hayabusa."));
@@ -141,7 +141,7 @@ void WeaponEnchanter::apply_magic()
                 break;
             }
 
-            this->o_ptr->name2 = get_random_ego(INVEN_BOW, true);
+            this->o_ptr->ego_idx = get_random_ego(INVEN_BOW, true);
         }
 
         break;
@@ -155,7 +155,7 @@ void WeaponEnchanter::apply_magic()
                 break;
             }
 
-            this->o_ptr->name2 = get_random_ego(INVEN_AMMO, true);
+            this->o_ptr->ego_idx = get_random_ego(INVEN_AMMO, true);
             while (one_in_(10L * this->o_ptr->dd * this->o_ptr->ds)) {
                 this->o_ptr->dd++;
             }
@@ -169,7 +169,7 @@ void WeaponEnchanter::apply_magic()
 
         if (this->power < -1) {
             if (randint0(MAX_DEPTH) < this->level) {
-                this->o_ptr->name2 = get_random_ego(INVEN_AMMO, false);
+                this->o_ptr->ego_idx = get_random_ego(INVEN_AMMO, false);
             }
         }
 
diff --git a/src/object/lite-processor.cpp b/src/object/lite-processor.cpp
index 33060014f..a9021d2c8 100644
--- a/src/object/lite-processor.cpp
+++ b/src/object/lite-processor.cpp
@@ -25,7 +25,7 @@ void reduce_lite_life(PlayerType *player_ptr)
     if (o_ptr->is_fixed_artifact() || (o_ptr->sval == SV_LITE_FEANOR) || (o_ptr->fuel <= 0))
         return;
 
-    if (o_ptr->name2 == EgoType::LITE_LONG) {
+    if (o_ptr->ego_idx == EgoType::LITE_LONG) {
         if (w_ptr->game_turn % (TURNS_PER_TICK * 2))
             o_ptr->fuel--;
     } else
@@ -53,7 +53,7 @@ void notice_lite_change(PlayerType *player_ptr, ObjectType *o_ptr)
         msg_print(_("明かりが消えてしまった！", "Your light has gone out!"));
         player_ptr->update |= (PU_TORCH);
         player_ptr->update |= (PU_BONUS);
-    } else if (o_ptr->name2 == EgoType::LITE_LONG) {
+    } else if (o_ptr->ego_idx == EgoType::LITE_LONG) {
         if ((o_ptr->fuel < 50) && (!(o_ptr->fuel % 5)) && (w_ptr->game_turn % (TURNS_PER_TICK * 2))) {
             if (disturb_minor)
                 disturb(player_ptr, false, true);
diff --git a/src/object/object-flags.cpp b/src/object/object-flags.cpp
index bd7845e9a..06c58e988 100644
--- a/src/object/object-flags.cpp
+++ b/src/object/object-flags.cpp
@@ -22,21 +22,21 @@ static void object_flags_lite(const ObjectType *o_ptr, TrFlags &flgs)
         return;
     }
 
-    auto *e_ptr = &e_info[o_ptr->name2];
+    auto *e_ptr = &e_info[o_ptr->ego_idx];
     flgs.set(e_ptr->flags);
 
     auto is_out_of_fuel = o_ptr->fuel == 0;
-    if ((o_ptr->name2 == EgoType::AURA_FIRE) && is_out_of_fuel && (o_ptr->sval <= SV_LITE_LANTERN)) {
+    if ((o_ptr->ego_idx == EgoType::AURA_FIRE) && is_out_of_fuel && (o_ptr->sval <= SV_LITE_LANTERN)) {
         flgs.reset(TR_SH_FIRE);
         return;
     }
 
-    if ((o_ptr->name2 == EgoType::LITE_INFRA) && is_out_of_fuel && (o_ptr->sval <= SV_LITE_LANTERN)) {
+    if ((o_ptr->ego_idx == EgoType::LITE_INFRA) && is_out_of_fuel && (o_ptr->sval <= SV_LITE_LANTERN)) {
         flgs.reset(TR_INFRA);
         return;
     }
 
-    if ((o_ptr->name2 == EgoType::LITE_EYE) && is_out_of_fuel && (o_ptr->sval <= SV_LITE_LANTERN)) {
+    if ((o_ptr->ego_idx == EgoType::LITE_EYE) && is_out_of_fuel && (o_ptr->sval <= SV_LITE_LANTERN)) {
         flgs.reset(TR_RES_BLIND);
         flgs.reset(TR_SEE_INVIS);
     }
diff --git a/src/object/object-value-calc.cpp b/src/object/object-value-calc.cpp
index a7f8440e2..61beb7278 100644
--- a/src/object/object-value-calc.cpp
+++ b/src/object/object-value-calc.cpp
@@ -34,7 +34,7 @@ PRICE flag_cost(const ObjectType *o_ptr, int plusses)
         auto *a_ptr = &a_info[o_ptr->fixed_artifact_idx];
         flgs.reset(a_ptr->flags);
     } else if (o_ptr->is_ego()) {
-        auto *e_ptr = &e_info[o_ptr->name2];
+        auto *e_ptr = &e_info[o_ptr->ego_idx];
         flgs.reset(e_ptr->flags);
     }
 
diff --git a/src/object/object-value.cpp b/src/object/object-value.cpp
index 6ef958f82..4380cf283 100644
--- a/src/object/object-value.cpp
+++ b/src/object/object-value.cpp
@@ -153,7 +153,7 @@ PRICE object_value_real(const ObjectType *o_ptr)
         value += flag_cost(o_ptr, o_ptr->pval);
         return value;
     } else if (o_ptr->is_ego()) {
-        auto *e_ptr = &e_info[o_ptr->name2];
+        auto *e_ptr = &e_info[o_ptr->ego_idx];
         if (!e_ptr->cost)
             return 0;
 
diff --git a/src/perception/identification.cpp b/src/perception/identification.cpp
index ac6490696..4c7053470 100644
--- a/src/perception/identification.cpp
+++ b/src/perception/identification.cpp
@@ -128,7 +128,7 @@ bool screen_object(PlayerType *player_ptr, ObjectType *o_ptr, BIT_FLAGS mode)
     if (flgs.has(TR_LITE_M3))
         rad -= 3;
 
-    if (o_ptr->name2 == EgoType::LITE_SHINE)
+    if (o_ptr->ego_idx == EgoType::LITE_SHINE)
         rad++;
 
     if (flgs.has(TR_LITE_FUEL) && flgs.has_not(TR_DARK_SOURCE)) {
@@ -144,7 +144,7 @@ bool screen_object(PlayerType *player_ptr, ObjectType *o_ptr, BIT_FLAGS mode)
     if (rad != 0)
         info[i++] = desc;
 
-    if (o_ptr->name2 == EgoType::LITE_LONG) {
+    if (o_ptr->ego_idx == EgoType::LITE_LONG) {
         info[i++] = _("それは長いターン明かりを授ける。", "It provides light for much longer time.");
     }
 
diff --git a/src/racial/racial-android.cpp b/src/racial/racial-android.cpp
index 79ac431ce..05dd51f23 100644
--- a/src/racial/racial-android.cpp
+++ b/src/racial/racial-android.cpp
@@ -82,7 +82,7 @@ void calc_android_exp(PlayerType *player_ptr)
             level = (level + std::max(a_info[o_ptr->fixed_artifact_idx].level - 8, 5)) / 2;
             level += std::min(20, a_info[o_ptr->fixed_artifact_idx].rarity / (a_info[o_ptr->fixed_artifact_idx].gen_flags.has(ItemGenerationTraitType::INSTA_ART) ? 10 : 3));
         } else if (o_ptr->is_ego()) {
-            level += std::max(3, (e_info[o_ptr->name2].rating - 5) / 2);
+            level += std::max(3, (e_info[o_ptr->ego_idx].rating - 5) / 2);
         } else if (o_ptr->art_name) {
             int32_t total_flags = flag_cost(o_ptr, o_ptr->pval);
             int fake_level;
diff --git a/src/save/item-writer.cpp b/src/save/item-writer.cpp
index 50513fae5..eccbe96d2 100644
--- a/src/save/item-writer.cpp
+++ b/src/save/item-writer.cpp
@@ -23,7 +23,7 @@ static void write_item_flags(ObjectType *o_ptr, BIT_FLAGS *flags)
         set_bits(*flags, SaveDataItemFlagType::FIXED_ARTIFACT_IDX);
 
     if (o_ptr->is_ego())
-        set_bits(*flags, SaveDataItemFlagType::NAME2);
+        set_bits(*flags, SaveDataItemFlagType::EGO_IDX);
 
     if (o_ptr->timeout)
         set_bits(*flags, SaveDataItemFlagType::TIMEOUT);
@@ -104,8 +104,8 @@ static void write_item_info(ObjectType *o_ptr, const BIT_FLAGS flags)
     if (any_bits(flags, SaveDataItemFlagType::FIXED_ARTIFACT_IDX))
         wr_s16b(o_ptr->fixed_artifact_idx);
 
-    if (any_bits(flags, SaveDataItemFlagType::NAME2))
-        wr_byte((byte)o_ptr->name2);
+    if (any_bits(flags, SaveDataItemFlagType::EGO_IDX))
+        wr_byte((byte)o_ptr->ego_idx);
 
     if (any_bits(flags, SaveDataItemFlagType::TIMEOUT))
         wr_s16b(o_ptr->timeout);
diff --git a/src/specific-object/torch.cpp b/src/specific-object/torch.cpp
index 09df10bcc..5603bee2f 100644
--- a/src/specific-object/torch.cpp
+++ b/src/specific-object/torch.cpp
@@ -91,7 +91,7 @@ void update_lite_radius(PlayerType *player_ptr)
         if (!o_ptr->k_idx)
             continue;
 
-        if (o_ptr->name2 == EgoType::LITE_SHINE)
+        if (o_ptr->ego_idx == EgoType::LITE_SHINE)
             player_ptr->cur_lite++;
 
         if (flgs.has_not(TR_DARK_SOURCE)) {
diff --git a/src/spell-realm/spells-craft.cpp b/src/spell-realm/spells-craft.cpp
index 370c76514..a6bf9d3b8 100644
--- a/src/spell-realm/spells-craft.cpp
+++ b/src/spell-realm/spells-craft.cpp
@@ -281,7 +281,7 @@ bool pulish_shield(PlayerType *player_ptr)
 #else
         msg_format("%s %s shine%s!", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "" : "s"));
 #endif
-        o_ptr->name2 = EgoType::REFLECTION;
+        o_ptr->ego_idx = EgoType::REFLECTION;
         enchant_equipment(player_ptr, o_ptr, randint0(3) + 4, ENCH_TOAC);
         o_ptr->discount = 99;
         chg_virtue(player_ptr, V_ENCHANT, 2);
diff --git a/src/spell/spells-object.cpp b/src/spell/spells-object.cpp
index 0fb3f16ac..4fa6172ed 100644
--- a/src/spell/spells-object.cpp
+++ b/src/spell/spells-object.cpp
@@ -240,7 +240,7 @@ bool curse_armor(PlayerType *player_ptr)
 
     /* Blast the armor */
     o_ptr->fixed_artifact_idx = 0;
-    o_ptr->name2 = EgoType::BLASTED;
+    o_ptr->ego_idx = EgoType::BLASTED;
     o_ptr->to_a = 0 - randint1(5) - randint1(5);
     o_ptr->to_h = 0;
     o_ptr->to_d = 0;
@@ -294,7 +294,7 @@ bool curse_weapon_object(PlayerType *player_ptr, bool force, ObjectType *o_ptr)
 
     /* Shatter the weapon */
     o_ptr->fixed_artifact_idx = 0;
-    o_ptr->name2 = EgoType::SHATTERED;
+    o_ptr->ego_idx = EgoType::SHATTERED;
     o_ptr->to_h = 0 - randint1(5) - randint1(5);
     o_ptr->to_d = 0 - randint1(5) - randint1(5);
     o_ptr->to_a = 0;
@@ -344,7 +344,7 @@ void brand_bolts(PlayerType *player_ptr)
         msg_print(_("クロスボウの矢が炎のオーラに包まれた！", "Your bolts are covered in a fiery aura!"));
 
         /* Ego-item */
-        o_ptr->name2 = EgoType::FLAME;
+        o_ptr->ego_idx = EgoType::FLAME;
         enchant_equipment(player_ptr, o_ptr, randint0(3) + 4, ENCH_TOHIT | ENCH_TODAM);
         return;
     }
@@ -585,86 +585,86 @@ void brand_weapon(PlayerType *player_ptr, int brand_type)
         if (o_ptr->tval == ItemKindType::SWORD) {
             act = _("は鋭さを増した！", "becomes very sharp!");
 
-            o_ptr->name2 = EgoType::SHARPNESS;
+            o_ptr->ego_idx = EgoType::SHARPNESS;
             o_ptr->pval = (PARAMETER_VALUE)m_bonus(5, player_ptr->current_floor_ptr->dun_level) + 1;
 
             if ((o_ptr->sval == SV_HAYABUSA) && (o_ptr->pval > 2))
                 o_ptr->pval = 2;
         } else {
             act = _("は破壊力を増した！", "seems very powerful.");
-            o_ptr->name2 = EgoType::EARTHQUAKES;
+            o_ptr->ego_idx = EgoType::EARTHQUAKES;
             o_ptr->pval = (PARAMETER_VALUE)m_bonus(3, player_ptr->current_floor_ptr->dun_level);
         }
 
         break;
     case 16:
         act = _("は人間の血を求めている！", "seems to be looking for humans!");
-        o_ptr->name2 = EgoType::KILL_HUMAN;
+        o_ptr->ego_idx = EgoType::KILL_HUMAN;
         break;
     case 15:
         act = _("は電撃に覆われた！", "covered with lightning!");
-        o_ptr->name2 = EgoType::BRAND_ELEC;
+        o_ptr->ego_idx = EgoType::BRAND_ELEC;
         break;
     case 14:
         act = _("は酸に覆われた！", "coated with acid!");
-        o_ptr->name2 = EgoType::BRAND_ACID;
+        o_ptr->ego_idx = EgoType::BRAND_ACID;
         break;
     case 13:
         act = _("は邪悪なる怪物を求めている！", "seems to be looking for evil monsters!");
-        o_ptr->name2 = EgoType::KILL_EVIL;
+        o_ptr->ego_idx = EgoType::KILL_EVIL;
         break;
     case 12:
         act = _("は異世界の住人の肉体を求めている！", "seems to be looking for demons!");
-        o_ptr->name2 = EgoType::KILL_DEMON;
+        o_ptr->ego_idx = EgoType::KILL_DEMON;
         break;
     case 11:
         act = _("は屍を求めている！", "seems to be looking for undead!");
-        o_ptr->name2 = EgoType::KILL_UNDEAD;
+        o_ptr->ego_idx = EgoType::KILL_UNDEAD;
         break;
     case 10:
         act = _("は動物の血を求めている！", "seems to be looking for animals!");
-        o_ptr->name2 = EgoType::KILL_ANIMAL;
+        o_ptr->ego_idx = EgoType::KILL_ANIMAL;
         break;
     case 9:
         act = _("はドラゴンの血を求めている！", "seems to be looking for dragons!");
-        o_ptr->name2 = EgoType::KILL_DRAGON;
+        o_ptr->ego_idx = EgoType::KILL_DRAGON;
         break;
     case 8:
         act = _("はトロルの血を求めている！", "seems to be looking for troll!s");
-        o_ptr->name2 = EgoType::KILL_TROLL;
+        o_ptr->ego_idx = EgoType::KILL_TROLL;
         break;
     case 7:
         act = _("はオークの血を求めている！", "seems to be looking for orcs!");
-        o_ptr->name2 = EgoType::KILL_ORC;
+        o_ptr->ego_idx = EgoType::KILL_ORC;
         break;
     case 6:
         act = _("は巨人の血を求めている！", "seems to be looking for giants!");
-        o_ptr->name2 = EgoType::KILL_GIANT;
+        o_ptr->ego_idx = EgoType::KILL_GIANT;
         break;
     case 5:
         act = _("は非常に不安定になったようだ。", "seems very unstable now.");
-        o_ptr->name2 = EgoType::TRUMP;
+        o_ptr->ego_idx = EgoType::TRUMP;
         o_ptr->pval = randint1(2);
         break;
     case 4:
         act = _("は血を求めている！", "thirsts for blood!");
-        o_ptr->name2 = EgoType::VAMPIRIC;
+        o_ptr->ego_idx = EgoType::VAMPIRIC;
         break;
     case 3:
         act = _("は毒に覆われた。", "is coated with poison.");
-        o_ptr->name2 = EgoType::BRAND_POIS;
+        o_ptr->ego_idx = EgoType::BRAND_POIS;
         break;
     case 2:
         act = _("は純ログルスに飲み込まれた。", "is engulfed in raw Logrus!");
-        o_ptr->name2 = EgoType::CHAOTIC;
+        o_ptr->ego_idx = EgoType::CHAOTIC;
         break;
     case 1:
         act = _("は炎のシールドに覆われた！", "is covered in a fiery shield!");
-        o_ptr->name2 = EgoType::BRAND_FIRE;
+        o_ptr->ego_idx = EgoType::BRAND_FIRE;
         break;
     default:
         act = _("は深く冷たいブルーに輝いた！", "glows deep, icy blue!");
-        o_ptr->name2 = EgoType::BRAND_COLD;
+        o_ptr->ego_idx = EgoType::BRAND_COLD;
         break;
     }
 
diff --git a/src/store/store-util.cpp b/src/store/store-util.cpp
index 3a7979f13..85aa5abe1 100644
--- a/src/store/store-util.cpp
+++ b/src/store/store-util.cpp
@@ -223,7 +223,7 @@ bool store_object_similar(ObjectType *o_ptr, ObjectType *j_ptr)
     if (o_ptr->to_a != j_ptr->to_a)
         return false;
 
-    if (o_ptr->name2 != j_ptr->name2)
+    if (o_ptr->ego_idx != j_ptr->ego_idx)
         return false;
 
     if (o_ptr->is_artifact() || j_ptr->is_artifact())
diff --git a/src/system/object-type-definition.cpp b/src/system/object-type-definition.cpp
index 3cfa76159..af949d360 100644
--- a/src/system/object-type-definition.cpp
+++ b/src/system/object-type-definition.cpp
@@ -346,7 +346,7 @@ bool ObjectType::is_rare() const
  */
 bool ObjectType::is_ego() const
 {
-    return this->name2 != EgoType::NONE;
+    return this->ego_idx != EgoType::NONE;
 }
 
 /*!
@@ -595,7 +595,7 @@ bool ObjectType::can_pile(const ObjectType *j_ptr) const
         return false;
     }
 
-    if (this->name2 != j_ptr->name2) {
+    if (this->ego_idx != j_ptr->ego_idx) {
         return false;
     }
 
diff --git a/src/system/object-type-definition.h b/src/system/object-type-definition.h
index 4762a5dc1..eba87b10e 100644
--- a/src/system/object-type-definition.h
+++ b/src/system/object-type-definition.h
@@ -35,7 +35,7 @@ public:
     ITEM_NUMBER number{}; /*!< Number of items */
     WEIGHT weight{}; /*!< Item weight */
     ARTIFACT_IDX fixed_artifact_idx{}; /*!< Artifact type, if any */
-    EgoType name2{}; /*!< Ego-Item type, if any */
+    EgoType ego_idx{}; /*!< Ego-Item type, if any */
 
     RandomArtActType activation_id{}; /*!< エゴ/アーティファクトの発動ID / Extra info activation index */
     byte chest_level = 0; /*!< 箱の中身レベル */
diff --git a/src/wizard/artifact-analyzer.cpp b/src/wizard/artifact-analyzer.cpp
index 93fcf37f4..8e180c1f1 100644
--- a/src/wizard/artifact-analyzer.cpp
+++ b/src/wizard/artifact-analyzer.cpp
@@ -197,7 +197,7 @@ static void analyze_misc_magic(ObjectType *o_ptr, concptr *misc_list)
     if (flgs.has(TR_LITE_M3))
         rad -= 3;
 
-    if (o_ptr->name2 == EgoType::LITE_SHINE)
+    if (o_ptr->ego_idx == EgoType::LITE_SHINE)
         rad++;
 
     if (flgs.has(TR_LITE_FUEL)) {
diff --git a/src/wizard/wizard-item-modifier.cpp b/src/wizard/wizard-item-modifier.cpp
index 0d501b2db..08eaf40a3 100644
--- a/src/wizard/wizard-item-modifier.cpp
+++ b/src/wizard/wizard-item-modifier.cpp
@@ -345,7 +345,7 @@ static void wiz_display_item(PlayerType *player_ptr, ObjectType *o_ptr)
     prt(format("kind = %-5d  level = %-4d  tval = %-5d  sval = %-5d", o_ptr->k_idx, k_info[o_ptr->k_idx].level, o_ptr->tval, o_ptr->sval), line, j);
     prt(format("number = %-3d  wgt = %-6d  ac = %-5d    damage = %dd%d", o_ptr->number, o_ptr->weight, o_ptr->ac, o_ptr->dd, o_ptr->ds), ++line, j);
     prt(format("pval = %-5d  toac = %-5d  tohit = %-4d  todam = %-4d", o_ptr->pval, o_ptr->to_a, o_ptr->to_h, o_ptr->to_d), ++line, j);
-    prt(format("name1 = %-4d  name2 = %-4d  cost = %ld", o_ptr->fixed_artifact_idx, o_ptr->name2, (long)object_value_real(o_ptr)), ++line, j);
+    prt(format("name1 = %-4d  name2 = %-4d  cost = %ld", o_ptr->fixed_artifact_idx, o_ptr->ego_idx, (long)object_value_real(o_ptr)), ++line, j);
     prt(format("ident = %04x  activation_id = %-4d  timeout = %-d", o_ptr->ident, o_ptr->activation_id, o_ptr->timeout), ++line, j);
     prt(format("chest_level = %-4d  fuel = %-d", o_ptr->chest_level, o_ptr->fuel), ++line, j);
     prt(format("smith_hit = %-4d  smith_damage = %-4d", o_ptr->smith_hit, o_ptr->smith_damage), ++line, j);
@@ -1043,7 +1043,7 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
             if (must || ok_ego) {
                 if (e_ids.size() > 0) {
                     o_ptr->prep(k_idx);
-                    o_ptr->name2 = e_ids[0];
+                    o_ptr->ego_idx = e_ids[0];
                     apply_ego(o_ptr, player_ptr->current_floor_ptr->base_level);
                 } else {
                     int max_roll = 1000;
@@ -1060,7 +1060,7 @@ WishResultType do_cmd_wishing(PlayerType *player_ptr, int prob, bool allow_art,
 
                         EgoType e_idx = EgoType::NONE;
                         for (auto e : e_ids) {
-                            if (o_ptr->name2 == e) {
+                            if (o_ptr->ego_idx == e) {
                                 e_idx = e;
                                 break;
                             }
-- 
2.11.0