Propageted the AegisName fix to scripts and pre-re database

This commit just propagates the AegisName changes to the pre-re database
and to the (re) scripts.

Two issues are fixed as a side-effect:

- The ghost_palace script was referring the non-existing constant(s):
  Thanatos_Two-Handed_Staff == (Thanatos_Two) - (Handed_Staff) == 0.
  Paired with the script engine's inability to differentiate between
  constants and player variables, that produced a very subtle issue.
- The item RAG203 is sold by a NPC (Rebellion Weapon Vending). Due to a
  pair of swapped AegisName constants (RAG203 and RAG203_), the slotted
  version was sold by the NPC instead of hte non-slotted one (the issue
  was actually fixed in the previous commit, although the description of
  the fix is here - these two commits are only split for legibility
  purposes but they're to be considered indivisible).

Signed-off-by: Haru <haru@dotalux.com>

16 files changed, 295 insertions, 294 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 4e77704da..836020da8 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -50556,7 +50556,7 @@ item_db: (
 /*
 {
 	Id: 5744
-	AegisName: "Capricon_Crown"
+	AegisName: "Capricorn_Crown"
 	Name: "Capricon Crown"
 	Type: 5
 	Buy: 20
@@ -50575,7 +50575,7 @@ item_db: (
 /*
 {
 	Id: 5745
-	AegisName: "Capricon_Diadem"
+	AegisName: "Capricorn_Diadem"
 	Name: "Capricon Diadem"
 	Type: 5
 	Buy: 20
@@ -56986,7 +56986,7 @@ item_db: (
 },
 {
 	Id: 7062
-	AegisName: "Broken_Turtle_Shell"
+	AegisName: "Turtle_Shell_"
 	Name: "Broken Turtle Shell"
 	Type: 3
 	Buy: 280
@@ -72932,7 +72932,7 @@ item_db: (
 },
 {
 	Id: 12416
-	AegisName: "LUcky_Egg_C3"
+	AegisName: "Lucky_Egg_C3"
 	Name: "Lucky Egg C3"
 	Type: 2
 	Buy: 20
@@ -81769,7 +81769,7 @@ item_db: (
 },
 {
 	Id: 13521
-	AegisName: "Garment_Card_Scroll_Box"
+	AegisName: "Hood_Card_Scroll_Box"
 	Name: "Garment Card Pet Egg Scroll Box"
 	Type: 18
 	Buy: 20
@@ -81778,7 +81778,7 @@ item_db: (
 },
 {
 	Id: 13522
-	AegisName: "Shield_Card_Scroll_Box"
+	AegisName: "Hood_Card_Scroll_Box2"
 	Name: "Shield Card Pet Egg Scroll Box"
 	Type: 18
 	Buy: 20
@@ -85919,7 +85919,7 @@ item_db: (
 },
 {
 	Id: 13896
-	AegisName: "Mimic_Scroll_Box5"
+	AegisName: "Mimic_Summon_Box5"
 	Name: "Mimic Summoning 5 Box"
 	Type: 18
 	Buy: 20
@@ -85947,7 +85947,7 @@ item_db: (
 },
 {
 	Id: 13898
-	AegisName: "Alice_Scroll_Box5"
+	AegisName: "Alice_Summon_Box5"
 	Name: "Alice Summoning 5 Box"
 	Type: 18
 	Buy: 20
@@ -85961,7 +85961,7 @@ item_db: (
 },
 {
 	Id: 13899
-	AegisName: "Mimic_Scroll_Box10"
+	AegisName: "Mimic_Summon_Box10"
 	Name: "Mimic Summoning 10 Box"
 	Type: 18
 	Buy: 20
@@ -85989,7 +85989,7 @@ item_db: (
 },
 {
 	Id: 13901
-	AegisName: "Alice_Scroll_Box10"
+	AegisName: "Alice_Summon_Box10"
 	Name: "Alice Summoning 10 Box"
 	Type: 18
 	Buy: 20
@@ -92024,7 +92024,7 @@ item_db: (
 /*
 {
 	Id: 14230
-	AegisName: "Note_Headphones_Box"
+	AegisName: "Headphone_Box"
 	Name: "Note Headphones Box"
 	Type: 18
 	Weight: 10
@@ -92034,7 +92034,7 @@ item_db: (
 /*
 {
 	Id: 14231
-	AegisName: "Novice_Breastplate_Boxes"
+	AegisName: "Novice_Box"
 	Name: "Novice Breastplate Boxes"
 	Type: 18
 	Weight: 10
@@ -92083,7 +92083,7 @@ item_db: (
 },
 {
 	Id: 14236
-	AegisName: "Steamed_Tongue_Box_20"
+	AegisName: "Str_Dish_Box60"
 	Name: "Steamed Tongue 20 Box"
 	Type: 18
 	Buy: 20
@@ -92092,7 +92092,7 @@ item_db: (
 },
 {
 	Id: 14237
-	AegisName: "Steamed_Desert_Scorpions_Box_20"
+	AegisName: "Agi_Dish_Box60"
 	Name: "Steamed Desert Scorpions Box(20)"
 	Type: 18
 	Buy: 20
@@ -92101,7 +92101,7 @@ item_db: (
 },
 {
 	Id: 14238
-	AegisName: "Stew_Of_Immortality_Box_20"
+	AegisName: "Int_Dish_Box60"
 	Name: "Immortal Stew 20 Box"
 	Type: 18
 	Buy: 20
@@ -92110,7 +92110,7 @@ item_db: (
 },
 {
 	Id: 14239
-	AegisName: "Dragon_Breath_Cocktail_Box_20"
+	AegisName: "Dex_Dish_Box60"
 	Name: "Dragon Breath Cocktail 20 Box"
 	Type: 18
 	Buy: 20
@@ -92119,7 +92119,7 @@ item_db: (
 },
 {
 	Id: 14240
-	AegisName: "Hwergelmir's_Tonic_Box_20"
+	AegisName: "Luk_Dish_Box60"
 	Name: "Hwergelmir's Tonic 20 Box"
 	Type: 18
 	Buy: 20
@@ -92128,7 +92128,7 @@ item_db: (
 },
 {
 	Id: 14241
-	AegisName: "Nine_Tail_Dish_Box_20"
+	AegisName: "Vit_Dish_Box60"
 	Name: "Nine Tail Dish 20 Box"
 	Type: 18
 	Buy: 20
@@ -92513,7 +92513,7 @@ item_db: (
 },
 {
 	Id: 14274
-	AegisName: "Amplification_10_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box"
 	Name: "Mystical Amplification Scroll 10 Box"
 	Type: 18
 	Buy: 20
@@ -92522,7 +92522,7 @@ item_db: (
 },
 {
 	Id: 14275
-	AegisName: "Amplification_30_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box30"
 	Name: "Mystical Amplification Scroll 30 Box"
 	Type: 18
 	Buy: 20
@@ -92531,7 +92531,7 @@ item_db: (
 },
 {
 	Id: 14276
-	AegisName: "Amplification_50_Scroll_Box2"
+	AegisName: "F_Magic_Scroll_Box50"
 	Name: "Mystical Amplification Scroll 50 Box"
 	Type: 18
 	Buy: 20
@@ -92540,7 +92540,7 @@ item_db: (
 },
 {
 	Id: 14277
-	AegisName: "Quagmire_10_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box"
 	Name: "Quagmire Scroll 10 Box"
 	Type: 18
 	Buy: 20
@@ -92549,7 +92549,7 @@ item_db: (
 },
 {
 	Id: 14278
-	AegisName: "Quagmire_30_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box30"
 	Name: "Quagmire Scroll 30 Box"
 	Type: 18
 	Buy: 20
@@ -92558,7 +92558,7 @@ item_db: (
 },
 {
 	Id: 14279
-	AegisName: "Quagmire_50_Scroll_Box2"
+	AegisName: "F_Quagmire_Scroll_Box50"
 	Name: "Quagmire Scroll 50 Box"
 	Type: 18
 	Buy: 20
@@ -92606,7 +92606,7 @@ item_db: (
 /*
 {
 	Id: 14284
-	AegisName: "Muffler_Box"
+	AegisName: "Muffler_C_Box"
 	Name: "Muffler Box"
 	Type: 18
 	Buy: 20
@@ -92617,7 +92617,7 @@ item_db: (
 /*
 {
 	Id: 14285
-	AegisName: "Balkiriah_Shield_Box"
+	AegisName: "Valkyrja's_Shield_C_Box"
 	Name: "Balkiriah Shield Box"
 	Type: 18
 	Buy: 20
@@ -92628,7 +92628,7 @@ item_db: (
 /*
 {
 	Id: 14286
-	AegisName: "Skull_Ring_Box"
+	AegisName: "Skul_Ring_C_Box"
 	Name: "Skull Ring Box"
 	Type: 18
 	Buy: 20
@@ -92638,7 +92638,7 @@ item_db: (
 */
 {
 	Id: 14287
-	AegisName: "Baricade_Repair_Kit"
+	AegisName: "S_Barricade_Repair_Kit"
 	Name: "Barricade Repair Kit"
 	Type: 18
 	Buy: 20
@@ -92652,7 +92652,7 @@ item_db: (
 },
 {
 	Id: 14288
-	AegisName: "Guardian_Stone_Repair_Kit"
+	AegisName: "S_Gstone_Repair_Kit"
 	Name: "Guardian Stone Repair Kit"
 	Type: 18
 	Buy: 20
@@ -92731,7 +92731,7 @@ item_db: (
 /*
 {
 	Id: 14294
-	AegisName: "Mercenary_Contract_Box5"
+	AegisName: "Mercenary_Contract_5Box"
 	Name: "Mercenary Contract Box 5ea"
 	Type: 2
 	Weight: 10
@@ -92741,7 +92741,7 @@ item_db: (
 /*
 {
 	Id: 14295
-	AegisName: "Mercenary_Contract_Box10"
+	AegisName: "Mercenary_Contract_10Bo"
 	Name: "Mercenary Contract Box 10ea"
 	Type: 2
 	Weight: 10
@@ -92820,7 +92820,7 @@ item_db: (
 },
 {
 	Id: 14314
-	AegisName: "PhreeoniS_Box"
+	AegisName: "Phreeoni_Scroll_Box"
 	Name: "Phreeoni Scroll Box"
 	Type: 2
 	Weight: 10
@@ -95110,7 +95110,7 @@ item_db: (
 */
 {
 	Id: 16304
-	AegisName: "Evil_Incarnation"
+	AegisName: "Evil_Incarnation_Disable"
 	Name: "Evil Incarnation"
 	Type: 2
 	Buy: 20
@@ -95968,7 +95968,7 @@ item_db: (
 },
 {
 	Id: 19507
-	AegisName: "Clear_Sun"
+	AegisName: "Fine_Sun"
 	Name: "Clear Sun"
 	Type: 5
 	Loc: 1024
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index 63f6efcb0..6681abf7c 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -3892,7 +3892,7 @@ Splendid_Box2: (
 /* currently unsupported or unknown ('Mysterious_Egg')
 Mysterious_Egg: (
 	("Lucky_Egg_C2",3),
-	("LUcky_Egg_C3",3),
+	("Lucky_Egg_C3",3),
 	("Lucky_Egg_C4",3),
 	("Lucky_Egg_C5",3),
 	("Lucky_Egg_C6",3),
diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf
index 3c952e258..808addc58 100644
--- a/db/pre-re/item_packages.conf
+++ b/db/pre-re/item_packages.conf
@@ -4745,8 +4745,8 @@ July7_Scroll: {
 		Named: true
 		Rate: 1
 	}
-//unsupported/unknown item 'Hair_Of_The_Strong'
-//	Hair_Of_The_Strong: {
+//unsupported/unknown item 'C_Hair_Of_The_Strong'
+//	C_Hair_Of_The_Strong: {
 //		Random: 1
 //		Announce: true
 //		Named: true
@@ -5283,7 +5283,7 @@ Buddah_Scroll: {
 		Rate: 1
 	}
 }
-Evil_Incarnation: {
+Evil_Incarnation_Disable: {
 	Dead_Tree_Branch_Box2: {
 		Random: 1
 		Named: true
@@ -5791,8 +5791,8 @@ Premium_Reset_Stone_Box: {
 		Random: 0
 	}
 }
-/* unsupported/unknown item 'FPr_Reset_Stone_Box'
-FPr_Reset_Stone_Box: {
+/* unsupported/unknown item 'FPremium_Reset_Stone_Box'
+FPremium_Reset_Stone_Box: {
 	Premium_Reset_Stone: {
 		Random: 0
 	}
@@ -5881,8 +5881,8 @@ Majestic_Devil_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box'
-Life_Ribbon_Box: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box'
+Ribbon_Of_Life_Box: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5890,8 +5890,8 @@ Life_Ribbon_Box: {
 //	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box2'
-Life_Ribbon_Box2: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box2'
+Ribbon_Of_Life_Box2: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5900,8 +5900,8 @@ Life_Ribbon_Box2: {
 //	}
 }
 */
-/* unsupported/unknown item 'Life_Ribbon_Box3'
-Life_Ribbon_Box3: {
+/* unsupported/unknown item 'Ribbon_Of_Life_Box3'
+Ribbon_Of_Life_Box3: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -6896,8 +6896,8 @@ Pisces_Diadem_Scroll: {
 		Named: true
 		Rate: 130
 	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Named: true
 //		Rate: 160
@@ -6920,8 +6920,8 @@ Pisces_Diadem_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'Pisces_Diadem_Box'
-Pisces_Diadem_Box: {
+/* unsupported/unknown item 'Pisces_Diadem_Box2'
+Pisces_Diadem_Box2: {
 //unsupported/unknown item 'Pisces_Diadem_Scroll'
 //	Pisces_Diadem_Scroll: {
 //		Random: 0
@@ -7105,8 +7105,8 @@ Energetic_Pisces_Box: {
 //	}
 }
 */
-/* unsupported/unknown item 'Aries_Scroll'
-Aries_Scroll: {
+/* unsupported/unknown item 'Aries_Scroll_'
+Aries_Scroll_: {
 //unsupported/unknown item 'Freyja_Boots'
 //	Freyja_Boots: {
 //		Random: 1
@@ -7173,53 +7173,53 @@ Aries_Scroll: {
 */
 /* unsupported/unknown item 'Aries_Scroll_Box'
 Aries_Scroll_Box: {
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
-//unsupported/unknown item 'Aries_Scroll'
-//	Aries_Scroll: {
+//unsupported/unknown item 'Aries_Scroll_'
+//	Aries_Scroll_: {
 //		Random: 0
 //		Named: true
 //	}
@@ -8305,8 +8305,8 @@ RWC_Super_Scroll: {
 //		Announce: true
 //		Rate: 250
 //	}
-//unsupported/unknown item 'Hair_Of_The_Strong'
-//	Hair_Of_The_Strong: {
+//unsupported/unknown item 'C_Hair_Of_The_Strong'
+//	C_Hair_Of_The_Strong: {
 //		Random: 1
 //		Announce: true
 //		Rate: 100
@@ -8362,8 +8362,8 @@ RWC_Super_Scroll: {
 //	}
 }
 */
-/* unsupported/unknown item 'Leo_Scroll'
-Leo_Scroll: {
+/* unsupported/unknown item 'Leo_Scroll3'
+Leo_Scroll3: {
 	Fallen_Bishop_Card: {
 		Random: 1
 		Announce: true
@@ -8493,8 +8493,8 @@ Ms_Virgo_Scroll: {
 		Announce: true
 		Rate: 300
 	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Rate: 800
 //	}
@@ -9571,7 +9571,7 @@ Wind_Type_Scroll: {
 //	}
 }
 */
-LUcky_Egg_C3: {
+Lucky_Egg_C3: {
 	Magic_Card_Album: {
 		Random: 1
 		Announce: true
@@ -11717,8 +11717,8 @@ Tw_Yellow_Scroll: {
 //		Random: 1
 //		Rate: 450
 //	}
-//unsupported/unknown item 'Life_Ribbon_Box3'
-//	Life_Ribbon_Box3: {
+//unsupported/unknown item 'Ribbon_Of_Life_Box3'
+//	Ribbon_Of_Life_Box3: {
 //		Random: 1
 //		Rate: 1000
 //	}
@@ -12033,8 +12033,8 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 25
 	}
-//unsupported/unknown item 'Devil_Whisper'
-//	Devil_Whisper: {
+//unsupported/unknown item 'Evil_Whisper'
+//	Evil_Whisper: {
 //		Random: 1
 //		Announce: true
 //		Rate: 40
@@ -12395,8 +12395,8 @@ Tw_Yellow_Scroll: {
 //		Announce: true
 //		Rate: 150
 //	}
-//unsupported/unknown item 'Little_Feather_Hat'
-//	Little_Feather_Hat: {
+//unsupported/unknown item 'Little_Fhat'
+//	Little_Fhat: {
 //		Random: 1
 //		Announce: true
 //		Rate: 100
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 426077afb..04315b083 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -146933,7 +146933,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Lightning_Grenade, 500; ">
+	Script: <" getitem Lighting_Sphere_, 500; ">
 },
 {
 	Id: 22740
@@ -146942,7 +146942,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Flash_Grenade, 500; ">
+	Script: <" getitem Blind_Sphere_, 500; ">
 },
 {
 	Id: 22741
@@ -146951,7 +146951,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Poison_Grenade, 500; ">
+	Script: <" getitem Poison_Sphere_, 500; ">
 },
 {
 	Id: 22742
@@ -146960,7 +146960,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Cyro_Grenade, 500; ">
+	Script: <" getitem Freezing_Sphere_, 500; ">
 },
 {
 	Id: 22743
@@ -146969,7 +146969,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 350
-	Script: <" getitem Incendiary_Grenade, 500; ">
+	Script: <" getitem Flare_Sphere_, 500; ">
 },
 {
 	Id: 22744
@@ -146978,7 +146978,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Armor_Piercing_Bullet, 500; ">
+	Script: <" getitem AP_Ammo, 500; ">
 },
 {
 	Id: 22745
@@ -146987,7 +146987,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Blazing_Bullet, 500; ">
+	Script: <" getitem Blaze_Bullet, 500; ">
 },
 {
 	Id: 22746
@@ -147005,7 +147005,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Lightning_Bullet, 500; ">
+	Script: <" getitem Electric_Shock_Bullet, 500; ">
 },
 {
 	Id: 22748
@@ -147014,7 +147014,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Magic_Stone_Bullet, 500; ">
+	Script: <" getitem Magical_Stone_Bullet, 500; ">
 },
 {
 	Id: 22749
@@ -147023,7 +147023,7 @@ item_db: (
 	Type: 2
 	Buy: 2
 	Weight: 250
-	Script: <" getitem Purifying_Bullet, 500; ">
+	Script: <" getitem Sanctified_Bullet, 500; ">
 },
 {
 	Id: 22777
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 5551fe51c..c196c95f5 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -4796,7 +4796,7 @@ HALLOWEEN_G_BOX: (
 	"Old_Card_Album",
 	"Old_Violet_Box"
 )
-Pumpkin_Candy_Holder: (
+Something_Candy_Holder: (
 	("Honey", 3),
 	("Candy", 7),
 	("Well_Baked_Cookie", 2),
diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf
index 1a70a63cc..ea4a1aee8 100644
--- a/db/re/item_packages.conf
+++ b/db/re/item_packages.conf
@@ -3870,7 +3870,7 @@ Brewing_Box: {
 		Named: true
 	}
 }
-Christmas_Pet_Scroll: {
+Xmas_Pet_Scroll: {
 	Fish_Head_Hat: {
 		Random: 1
 		Named: true
@@ -3966,7 +3966,7 @@ Christmas_Pet_Scroll: {
 		Rate: 50
 	}
 }
-Year_Of_Mouse_Scroll: {
+Lucky_Scroll08: {
 	Kafra_Card: {
 		Random: 1
 		Count: 15
@@ -4058,7 +4058,7 @@ Year_Of_Mouse_Scroll: {
 		Rate: 110
 	}
 }
-BRO_SM_Package: {
+Br_SwordPackage: {
 	Plate_Armor_: {
 		Random: 0
 		Named: true
@@ -4100,7 +4100,7 @@ BRO_SM_Package: {
 		Named: true
 	}
 }
-BRO_MG_Package: {
+Br_MagePackage: {
 	Silk_Robe_: {
 		Random: 0
 		Named: true
@@ -4138,7 +4138,7 @@ BRO_MG_Package: {
 		Named: true
 	}
 }
-BRO_AC_Package: {
+Br_AcolPackage: {
 	Saint_Robe_: {
 		Random: 0
 		Named: true
@@ -4176,7 +4176,7 @@ BRO_AC_Package: {
 		Named: true
 	}
 }
-BRO_AR_Package: {
+Br_ArcherPackage: {
 	Tights_: {
 		Random: 0
 		Named: true
@@ -4214,7 +4214,7 @@ BRO_AR_Package: {
 		Named: true
 	}
 }
-BRO_MC_Package: {
+Br_MerPackage: {
 	Chain_Mail_: {
 		Random: 0
 		Named: true
@@ -4252,7 +4252,7 @@ BRO_MC_Package: {
 		Named: true
 	}
 }
-BRO_TF_Package: {
+Br_ThiefPackage: {
 	Thief_Clothes_: {
 		Random: 0
 		Named: true
@@ -4733,7 +4733,7 @@ July7_Scroll: {
 		Named: true
 		Rate: 1
 	}
-	Hair_Of_The_Strong: {
+	C_Hair_Of_The_Strong: {
 		Random: 1
 		Announce: true
 		Named: true
@@ -5259,7 +5259,7 @@ Buddah_Scroll: {
 		Rate: 1
 	}
 }
-Evil_Incarnation: {
+Evil_Incarnation_Disable: {
 	Dead_Tree_Branch_Box2: {
 		Random: 1
 		Named: true
@@ -5746,8 +5746,8 @@ Pr_Reset_Stone_Box: {
 	}
 }
 */
-/* unsupported/unknown item 'FPr_Reset_Stone_Box'
-FPr_Reset_Stone_Box: {
+/* unsupported/unknown item 'FPremium_Reset_Stone_Box'
+FPremium_Reset_Stone_Box: {
 	Premium_Reset_Stone: {
 		Random: 0
 	}
@@ -5834,8 +5834,8 @@ Majestic_Devil_Scroll: {
 		Rate: 1
 	}
 }
-/* supported container but with no known entries 'Life_Ribbon_Box'
-Life_Ribbon_Box: {
+/* supported container but with no known entries 'Ribbon_Of_Life_Box'
+Ribbon_Of_Life_Box: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5843,8 +5843,8 @@ Life_Ribbon_Box: {
 //	}
 }
 */
-/* supported container but with no known entries 'Life_Ribbon_Box2'
-Life_Ribbon_Box2: {
+/* supported container but with no known entries 'Ribbon_Of_Life_Box2'
+Ribbon_Of_Life_Box2: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -5853,8 +5853,8 @@ Life_Ribbon_Box2: {
 //	}
 }
 */
-/* supported container but with no known entries 'Life_Ribbon_Box3'
-Life_Ribbon_Box3: {
+/* supported container but with no known entries 'Ribbon_Of_Life_Box3'
+Ribbon_Of_Life_Box3: {
 //unsupported/unknown item 'Life_Ribbon'
 //	Life_Ribbon: {
 //		Random: 0
@@ -6742,7 +6742,7 @@ Pisces_Diadem_Scroll: {
 		Named: true
 		Rate: 130
 	}
-	Life_Ribbon_Box3: {
+	Ribbon_Of_Life_Box3: {
 		Random: 1
 		Named: true
 		Rate: 160
@@ -6764,7 +6764,7 @@ Pisces_Diadem_Scroll: {
 		Rate: 70
 	}
 }
-Pisces_Diadem_Box: {
+Pisces_Diadem_Box2: {
 	Pisces_Diadem_Scroll: {
 		Random: 0
 		Named: true
@@ -6923,7 +6923,7 @@ Energetic_Pisces_Box: {
 		Named: true
 	}
 }
-Aries_Scroll: {
+Aries_Scroll_: {
 	Freyja_Boots: {
 		Random: 1
 		Announce: true
@@ -6987,43 +6987,43 @@ Aries_Scroll: {
 	}
 }
 Aries_Scroll_Box: {
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
-	Aries_Scroll: {
+	Aries_Scroll_: {
 		Random: 0
 		Named: true
 	}
@@ -8014,7 +8014,7 @@ RWC_Super_Scroll: {
 		Announce: true
 		Rate: 250
 	}
-	Hair_Of_The_Strong: {
+	C_Hair_Of_The_Strong: {
 		Random: 1
 		Announce: true
 		Rate: 100
@@ -8063,7 +8063,7 @@ RWC_Super_Scroll: {
 		Rate: 3000
 	}
 }
-Leo_Scroll: {
+Leo_Scroll3: {
 	Fallen_Bishop_Card: {
 		Random: 1
 		Announce: true
@@ -8186,7 +8186,7 @@ Ms_Virgo_Scroll: {
 		Announce: true
 		Rate: 300
 	}
-	Life_Ribbon_Box3: {
+	Ribbon_Of_Life_Box3: {
 		Random: 1
 		Rate: 800
 	}
@@ -9215,8 +9215,8 @@ Wind_Type_Scroll: {
 	}
 }
 */
-/* unsupported/unknown item 'LUcky_Egg_C3'
-LUcky_Egg_C3: {
+/* unsupported/unknown item 'Lucky_Egg_C3'
+Lucky_Egg_C3: {
 	Magic_Card_Album: {
 		Random: 1
 		Announce: true
@@ -9538,7 +9538,7 @@ Lucky_Egg_C5: {
 	}
 }
 Weather_Report_Box: {
-	Clear_Sun: {
+	Fine_Sun: {
 		Random: 0
 	}
 	Rainbow: {
@@ -11200,7 +11200,7 @@ Tw_Yellow_Scroll: {
 //		Random: 1
 //		Rate: 450
 //	}
-	Life_Ribbon_Box3: {
+	Ribbon_Of_Life_Box3: {
 		Random: 1
 		Rate: 1000
 	}
@@ -11498,7 +11498,7 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 25
 	}
-	Devil_Whisper: {
+	Evil_Whisper: {
 		Random: 1
 		Announce: true
 		Rate: 40
@@ -11833,7 +11833,7 @@ Tw_Yellow_Scroll: {
 		Announce: true
 		Rate: 150
 	}
-	Little_Feather_Hat: {
+	Little_Fhat: {
 		Random: 1
 		Announce: true
 		Rate: 100
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 5a3275805..9d72380f7 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -56950,7 +56950,7 @@ mob_db: (
 		Creeper_Bow: 20
 		Mental_Stick: 2
 		Blood_Thirst: 300
-		Celia_Card: 1
+		Ceila_Card: 1
 	}
 },
 {
@@ -58196,7 +58196,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 6000
 		Sg_White_Potion_Box: 4000
 		Sg_Blue_Potion_Box: 2000
-		Angry_Student_Pyuriel_Card: 1
+		Pyuriel_Card: 1
 	}
 },
 {
@@ -58249,7 +58249,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 100
 		Sg_White_Potion_Box: 1000
 		Sg_Blue_Potion_Box: 1000
-		Warrior_Lola_Card: 1
+		Lora_Card: 1
 	}
 },
 {
@@ -58418,7 +58418,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 6000
 		Sg_White_Potion_Box: 4000
 		Sg_Blue_Potion_Box: 2000
-		General_Daehyon_Card: 1
+		Daehyon_Card: 1
 	}
 },
 {
@@ -58471,7 +58471,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 100
 		Sg_White_Potion_Box: 1000
 		Sg_Blue_Potion_Box: 1000
-		Armed_Guard_Soheon_Card: 1
+		Soheon_Card: 1
 	}
 },
 {
@@ -58530,7 +58530,7 @@ mob_db: (
 		Sg_Weapon_Supply_Box: 6000
 		Sg_White_Potion_Box: 4000
 		Sg_Blue_Potion_Box: 2000
-		Guardian_Kades_Card: 1
+		Kades_Card: 1
 	}
 },
 {
@@ -63299,7 +63299,7 @@ mob_db: (
 		Bookclip_In_Memory: 1000
 		Worn_Out_Page: 1000
 		Snow_Flip: 5
-		Antique_Book_Card: 1
+		AntiqueBook_Card: 1
 	}
 },
 {
@@ -63350,7 +63350,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Mistic_Frozen: 20
 		Snow_Flip: 5
-		Lichtern_Blue_Card: 1
+		LichternB_Card: 1
 	}
 },
 {
@@ -63401,7 +63401,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Rough_Wind: 20
 		Slapping_Herb: 5
-		Lichtern_Yellow_Card: 1
+		LichternG_Card: 1 // FIXME: Are the yellow and green intended to be swapped? (see names in the item db)
 	}
 },
 {
@@ -63452,7 +63452,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Flame_Heart: 20
 		Peony_Mommy: 5
-		Lichtern_Red_Card: 1
+		LichternR_Card: 1
 	}
 },
 {
@@ -63503,7 +63503,7 @@ mob_db: (
 		Sparkling_Dust: 1000
 		Great_Nature: 20
 		Yggdrasil_Dust: 5
-		Lichtern_Green_Card: 1
+		LichternY_Card: 1 // FIXME: Are the yellow and green intended to be swapped? (see names in the item db)
 	}
 },
 {
@@ -63554,7 +63554,7 @@ mob_db: (
 		Alchol: 100
 		Detrimindexta: 100
 		Karvodailnirol: 100
-		Faithful_Manager_Card: 1
+		FaithfulManager_Card: 1
 	}
 },
 // Additional Monsters
@@ -64518,7 +64518,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Sticky_Mucus: 1000
 		White_Jewel: 500
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64569,7 +64569,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64619,7 +64619,7 @@ mob_db: (
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
 		Old_White_Cloth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64668,7 +64668,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 	}
 },
 {
@@ -64716,7 +64716,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Plate_Armor: 200
 	}
 },
@@ -64765,7 +64765,7 @@ mob_db: (
 		Coagulated_Spell: 10
 		Glast_Decayed_Nail: 1000
 		Glast_Horrendous_Mouth: 1000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Tights: 200
 	}
 },
@@ -64817,7 +64817,7 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 3000
 		Glast_Horrendous_Mouth: 2000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Full_Plate_Armor: 200
 	}
 },
@@ -64869,7 +64869,7 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 3000
 		Glast_Horrendous_Mouth: 2000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Lapier: 300
 	}
 },
@@ -64921,7 +64921,7 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 3000
 		Glast_Horrendous_Mouth: 2000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Brigan: 500
 	}
 },
@@ -64973,9 +64973,9 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 5000
 		Glast_Horrendous_Mouth: 5000
-		Contaminated_Magic: 500
+		Corrupted_Charm: 500
 		Halberd: 200
-		Agony_Of_Royal_Knight_Card: 1
+		UndeadKnightM_Card: 1
 	}
 },
 {
@@ -65026,8 +65026,8 @@ mob_db: (
 		Coagulated_Spell: 50
 		Glast_Decayed_Nail: 5000
 		Glast_Horrendous_Mouth: 5000
-		Contaminated_Magic: 500
-		Grudge_of_Royal_Knight_Card: 1
+		Corrupted_Charm: 500
+		UndeadKnightF_Card: 1
 	}
 },
 {
@@ -65079,8 +65079,8 @@ mob_db: (
 		Yggdrasilberry: 10000
 		Alchemy_Glove: 1000
 		Will_Of_Darkness_: 10000
-		Contaminated_Magic: 500
-		Corruption_Root_Card: 1
+		Corrupted_Charm: 500
+		CorruptionRoot_Card: 1
 	}
 },
 {
@@ -80040,7 +80040,7 @@ mob_db: (
 		Creeper_Bow: 10
 		Mental_Stick: 1
 		Blood_Thirst: 150
-		Celia_Card: 1
+		Ceila_Card: 1
 	}
 },
 {
@@ -81140,7 +81140,7 @@ mob_db: (
 		Leaf_Bookmark: 2000
 		Bookclip_In_Memory: 1000
 		Worn_Out_Page: 1000
-		Antique_Book_Card: 1
+		AntiqueBook_Card: 1
 	}
 },
 {
@@ -81189,7 +81189,7 @@ mob_db: (
 		Leaf_Bookmark: 2000
 		Bookclip_In_Memory: 1000
 		Worn_Out_Page: 1000
-		Antique_Book_Card: 1
+		AntiqueBook_Card: 1
 	}
 },
 {
@@ -81973,8 +81973,8 @@ mob_db: (
 		White_Herb: 950
 		Lemon: 160
 		Elunium_Stone: 100
-		Twisted_Key_of_Time: 15
-		Twisted_Key_of_Time: 15
+		Key_Of_Twisted_Time: 15
+		Key_Of_Twisted_Time: 15
 		Big_Ben_Card: 1
 	}
 },
@@ -82024,7 +82024,7 @@ mob_db: (
 		Skull: 750
 		Oridecon: 100
 		Zargon: 750
-		Twisted_Key_of_Time: 10
+		Key_Of_Twisted_Time: 10
 		Big_Bell_Card: 1
 	}
 },
@@ -82069,8 +82069,8 @@ mob_db: (
 		Steel: 250
 		Leaflet_Of_Hinal: 425
 		Memorize_Book: 1
-		Twisted_Key_of_Time: 1000
-		Twisted_Key_of_Time: 1000
+		Key_Of_Twisted_Time: 1000
+		Key_Of_Twisted_Time: 1000
 		Time_Keeper_Card: 1
 	}
 },
@@ -82166,7 +82166,7 @@ mob_db: (
 		Encyclopedia: 5
 		Wizardy_Staff: 1
 		Old_Card_Album: 2
-		Twisted_Key_of_Time: 1500
+		Key_Of_Twisted_Time: 1500
 		Elder_Branch: 500
 		Arc_Elder_Card: 1
 	}
@@ -82216,11 +82216,11 @@ mob_db: (
 	Drops: {
 		Tatters_Clothes: 2500
 		Soft_Feather: 1000
-		Cyclops_Glasses: 1
+		One_Eyed_Glass_: 1
 		Crystal_Mirror: 1
 		Pocket_Watch__: 2
 		Quadrille_: 1
-		Menswear: 1
+		Lounge_Suit: 1
 		Owl_Viscount_Card: 1
 	}
 },
@@ -82272,9 +82272,9 @@ mob_db: (
 		Soft_Feather: 1500
 		Kakkung_: 1
 		Staff_Of_Soul: 1
-		Menswear: 3
+		Lounge_Suit: 3
 		Sword_Stick: 1
-		Cyclops_Glasses: 1
+		One_Eyed_Glass_: 1
 		Owl_Marquees_Card: 1
 	}
 },
@@ -82883,7 +82883,7 @@ mob_db: (
 	DamageMotion: 420
 	Drops: {
 		Decayed_Nail: 3000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -82927,7 +82927,7 @@ mob_db: (
 	Drops: {
 		Mementos: 2500
 		Worn_Out_Page: 1500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -82971,7 +82971,7 @@ mob_db: (
 	Drops: {
 		Exorcize_Herb: 1000
 		Withered_Flower: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83015,7 +83015,7 @@ mob_db: (
 	Drops: {
 		Sticky_Mucus: 3000
 		Horn: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83058,7 +83058,7 @@ mob_db: (
 	DamageMotion: 336
 	Drops: {
 		Immortal_Heart: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83101,7 +83101,7 @@ mob_db: (
 	DamageMotion: 192
 	Drops: {
 		Decayed_Nail: 3000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83145,7 +83145,7 @@ mob_db: (
 	Drops: {
 		Horrendous_Mouth: 3500
 		Sharpened_Cuspid: 2000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83189,7 +83189,7 @@ mob_db: (
 	Drops: {
 		Skel_Bone: 3500
 		Manacles: 2500
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83233,7 +83233,7 @@ mob_db: (
 	Drops: {
 		Realgar_Wine: 1000
 		Immortal_Heart: 2000
-		Gray_Piece: 1000
+		Gray_Shard: 1000
 	}
 },
 {
@@ -83277,7 +83277,7 @@ mob_db: (
 	Drops: {
 		Realgar_Wine: 5000
 		Exorcize_Herb: 5000
-		Gray_Piece: 1500
+		Gray_Shard: 1500
 	}
 },
 {
@@ -83321,7 +83321,7 @@ mob_db: (
 	Drops: {
 		Petite_DiablOfs_Horn: 2500
 		Tendon: 2500
-		Gray_Piece: 1500
+		Gray_Shard: 1500
 	}
 },
 {
@@ -83366,8 +83366,8 @@ mob_db: (
 	DamageMotion: 360
 	Drops: {
 		Evil_Horn: 2000
-		Gray_Piece: 10000
-		Gray_Piece: 10000
+		Gray_Shard: 10000
+		Gray_Shard: 10000
 	}
 },
 //2960,MM_FLAMECROSS
@@ -83571,10 +83571,10 @@ mob_db: (
 		Needle_Of_Alarm: 3000
 		Memorize_Book_: 10
 		Brigan: 3000
-		Twisted_Key_of_Time: 3000
-		Cyclops_Glasses: 20
+		Key_Of_Twisted_Time: 3000
+		One_Eyed_Glass_: 20
 		Quadrille_: 5
-		Menswear: 3
+		Lounge_Suit: 3
 		Timeholder_Card: 1
 	}
 },
@@ -83699,9 +83699,9 @@ mob_db: (
 	DamageMotion: 0
 	MvpExp: 0
 	Drops: {
-		Organic_Pumpkin: 5000
-		Organic_Pumpkin: 5000
-		Organic_Pumpkin: 1000
+		ORGANIC_PUMPKIN: 5000
+		ORGANIC_PUMPKIN: 5000
+		ORGANIC_PUMPKIN: 1000
 		Cigar: 100
 		Pumpkin_Head: 1000
 		Gift_Box_1: 100
@@ -83746,9 +83746,9 @@ mob_db: (
 	DamageMotion: 0
 	MvpExp: 0
 	Drops: {
-		Inorganic_Pumpkin: 5000
-		Inorganic_Pumpkin: 5000
-		Inorganic_Pumpkin: 1000
+		INORGANIC_PUMPKIN: 5000
+		INORGANIC_PUMPKIN: 5000
+		INORGANIC_PUMPKIN: 1000
 		Cigar: 100
 		Pumpkin_Head: 1000
 		Gift_Box_1: 100
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 505aa2603..dd7ebe87a 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -22426,9 +22426,9 @@ skill_db: (
 		State: "MadoGear"
 		Items: {
 			Pilebuncker: 0
-			Pilebunker_S: 0
-			Pilebunker_P: 0
-			Pilebunker_T: 0
+			Pilebuncker_S: 0
+			Pilebuncker_P: 0
+			Pilebuncker_T: 0
 		}
 	}
 },
@@ -38196,4 +38196,4 @@ skill_db: (
 	}
 	NumberOfHits: 0
 },
-)
\ No newline at end of file
+)
diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt
index 6f16d437c..acfd60f9f 100644
--- a/npc/re/events/halloween_2013.txt
+++ b/npc/re/events/halloween_2013.txt
@@ -267,7 +267,7 @@ L_Explain:
 
 niflheim,181,173,5	script	Chef Candycon#2013HE	4_M_NFDEADSWDMAN,{
 	if (eve_bs == 1) {
-		if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) >= 30) {
+		if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) >= 30) {
 			mes "[Chef Candycon]";
 			mes "Clang~Clang~!";
 			next;
@@ -400,16 +400,16 @@ L_GivePumpkin:
 		mes "Eeh~~ You have no use for those pumpkins~~";
 		close;
 	}
-	if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) < 30) {
+	if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) < 30) {
 		mes "[Chef Candycon]";
 		mes "Ooops where is pumpkin? escaped again?";
 		mes "Oh, boy...no... you should go to get them again...";
 		close;
 	}
-	if (countitem(Inorganic_Pumpkin))
-		delitem Inorganic_Pumpkin,countitem(Inorganic_Pumpkin);
-	if (countitem(Organic_Pumpkin))
-		delitem Organic_Pumpkin,countitem(Organic_Pumpkin);
+	if (countitem(INORGANIC_PUMPKIN))
+		delitem INORGANIC_PUMPKIN, countitem(INORGANIC_PUMPKIN);
+	if (countitem(ORGANIC_PUMPKIN))
+		delitem ORGANIC_PUMPKIN, countitem(ORGANIC_PUMPKIN);
 	eve_bs = 2;
 	getitem HALLOWEEN_G_BOX,1;
 	erasequest 11378;
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 0b21767f7..fc01464f2 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -2226,7 +2226,7 @@ OnEnable:
 	end;
 }
 
-// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_STAT_Boots
+// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_*_Boots
 // Upon trade all refines got removed
 // Uses Temporal_Crystal
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -2275,7 +2275,7 @@ glast_01,210,273,5	script	Hugin's Butler	1_F_04,{
 		mes("You can trade ^0000FF1 Temporal Boots and 5 Temporal Crystals^000000 for 1 of the following items. ^FF0000Previous refine rate will not be retained with these new ones^000000.");
 		next;
 		setarray .@type$[0], "Strength", "Intelligence", "Agility", "Vitality", "Dexterity", "Luck";
-		setarray .@equip_type[0], Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots;
+		setarray .@equip_type[0], Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots;
 		.@select = select("Cancel", "Str Boots", "Int Boots", "Agi Boots", "Vit Boots", "Dex Boots", "Luk Boots");
 		switch (.@select) {
 		case 1:
@@ -2296,7 +2296,7 @@ glast_01,210,273,5	script	Hugin's Butler	1_F_04,{
 				mes("The boots has been upgraded as you want.");
 				delequip .@part;
 				delitem Temporal_Crystal, 5;
-				getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots
+				getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots
 				close;
 			}
 			mes("[Hugin's Butler]");
@@ -2307,7 +2307,7 @@ glast_01,210,273,5	script	Hugin's Butler	1_F_04,{
 }
 
 // Enchant NPC - Coagulated Spell to enchants on 4th slot. First one to pick --> upgraded --> additional random enchant on 3rd slot
-// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_STAT_Boots
+// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_*_Boots
 // Enchanting can fail, the 3th slot random one is guaranteed
 // Refine remains
 // Item Used: Coagulated_Spell
@@ -2371,18 +2371,18 @@ glast_01,212,273,4	script	Hugin's Magic Master	1_F_01,{ // Custom text due to of
 	setarray .@enchant_rate[0], 90, 80, 70, 50, 100; // Enchant Success Rate in %
 	.@random = rand(1, 100);
 	switch (.@equip_id) {
-	case Temporal_STR_Boots:
-	case Temporal_INT_Boots:
-	case Temporal_AGI_Boots:
-	case Temporal_VIT_Boots:
-	case Temporal_DEX_Boots:
-	case Temporal_LUK_Boots:
-	case Temporal_STR_Boots_:
-	case Temporal_INT_Boots_:
-	case Temporal_AGI_Boots_:
-	case Temporal_VIT_Boots_:
-	case Temporal_DEX_Boots_:
-	case Temporal_LUK_Boots_:
+	case Temporal_Str_Boots:
+	case Temporal_Int_Boots:
+	case Temporal_Agi_Boots:
+	case Temporal_Vit_Boots:
+	case Temporal_Dex_Boots:
+	case Temporal_Luk_Boots:
+	case Temporal_Str_Boots_:
+	case Temporal_Int_Boots_:
+	case Temporal_Agi_Boots_:
+	case Temporal_Vit_Boots_:
+	case Temporal_Dex_Boots_:
+	case Temporal_Luk_Boots_:
 		if (.@card3 == 0) { //4th slot 1st try enchanting
 			.@cost = .@enchant_cost[0];
 			.@scs = .@enchant_rate[0];
@@ -2566,9 +2566,9 @@ glast_01,212,273,4	script	Hugin's Magic Master	1_F_01,{ // Custom text due to of
 	close;
 }
 
-// Socket NPC - Contaminated_Magic or Temporal_Crystal to add card slot
+// Socket NPC - Corrupted_Charm or Temporal_Crystal to add card slot
 // After the boots were slotted, you can still enchant, but slotting removes any enchants and refines applied before.
-// Item Used: Contaminated_Magic, Temporal_Crystal
+// Item Used: Corrupted_Charm, Temporal_Crystal
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 glast_01,210,270,0	script	Hugin's Craftsman	4_F_JOB_BLACKSMITH,{
 	disable_items;
@@ -2601,12 +2601,12 @@ glast_01,210,270,0	script	Hugin's Craftsman	4_F_JOB_BLACKSMITH,{
 	}
 	.@equip_id = getequipid(.@part);
 	switch (.@equip_id) {
-	case Temporal_STR_Boots:
-	case Temporal_INT_Boots:
-	case Temporal_AGI_Boots:
-	case Temporal_VIT_Boots:
-	case Temporal_DEX_Boots:
-	case Temporal_LUK_Boots:
+	case Temporal_Str_Boots:
+	case Temporal_Int_Boots:
+	case Temporal_Agi_Boots:
+	case Temporal_Vit_Boots:
+	case Temporal_Dex_Boots:
+	case Temporal_Luk_Boots:
 		mes("[Hugin's Craftsman]");
 		mes("The ^FF0000Boots and all enchants or refines will be lost if you fail this.^000000\r"
 				"Still want to risk it?");
@@ -2629,7 +2629,7 @@ glast_01,210,270,0	script	Hugin's Craftsman	4_F_JOB_BLACKSMITH,{
 		mes("Then my last question:\r"
 				"Which item are you gonna use to pay me?");
 		next;
-		setarray .@slotpay[0], Temporal_Crystal, Contaminated_Magic;
+		setarray .@slotpay[0], Temporal_Crystal, Corrupted_Charm;
 		setarray .@slotcost[0], 10, 50;
 		setarray .@slotchance[0], 80, 65; // Custom rates
 		.@select = select("Cancel", "Temporal Crystal", "Contaminated Magic");
@@ -2664,18 +2664,18 @@ glast_01,210,270,0	script	Hugin's Craftsman	4_F_JOB_BLACKSMITH,{
 		specialeffect2 EF_PHARMACY_OK;
 		delequip .@part;
 		// todo: read aegis name and attach "_" to worn constant
-		if (.@equip_id == Temporal_STR_Boots) {
-			getitem2 Temporal_STR_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
-		} else if (.@equip_id == Temporal_INT_Boots) {
-			getitem2 Temporal_INT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
-		} else if (.@equip_id == Temporal_AGI_Boots) {
-			getitem2 Temporal_AGI_Boots_, 1, 1, 0, 0, 0, 0, .0, 0;
-		} else if (.@equip_id == Temporal_VIT_Boots) {
-			getitem2 Temporal_VIT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
-		} else if (.@equip_id == Temporal_DEX_Boots) {
-			getitem2 Temporal_DEX_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
-		} else if (.@equip_id == Temporal_LUK_Boots) {
-			getitem2 Temporal_LUK_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+		if (.@equip_id == Temporal_Str_Boots) {
+			getitem2 Temporal_Str_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+		} else if (.@equip_id == Temporal_Int_Boots) {
+			getitem2 Temporal_Int_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+		} else if (.@equip_id == Temporal_Agi_Boots) {
+			getitem2 Temporal_Agi_Boots_, 1, 1, 0, 0, 0, 0, .0, 0;
+		} else if (.@equip_id == Temporal_Vit_Boots) {
+			getitem2 Temporal_Vit_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+		} else if (.@equip_id == Temporal_Dex_Boots) {
+			getitem2 Temporal_Dex_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
+		} else if (.@equip_id == Temporal_Luk_Boots) {
+			getitem2 Temporal_Luk_Boots_, 1, 1, 0, 0, 0, 0, 0, 0;
 		}
 		close;
 	default:
@@ -2699,7 +2699,7 @@ glast_01,188,273,5	script	White Knight#1a	4_WHITEKNIGHT,{
 	mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000.");
 	mes("<ITEMLINK>White Knight Card<INFO>4608</INFO></ITEMLINK>");
 	next;
-	setarray .@item[0], Coagulated_Spell, Contaminated_Magic;
+	setarray .@item[0], Coagulated_Spell, Corrupted_Charm;
 	setarray .@cost[0], 3000, 70;
 	.@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000");
 	switch (.@select) {
@@ -2717,7 +2717,7 @@ glast_01,188,273,5	script	White Knight#1a	4_WHITEKNIGHT,{
 			close;
 		}
 		delitem .@item, .@cost;
-		getitem White_Knight_Card, 1;
+		getitem White_Knightage_Card, 1;
 		close;
 	}
 }
@@ -2732,7 +2732,7 @@ glast_01,192,273,3	script	Khalitzburg Knight#1a	4_F_KHALITZBURG,{
 	mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000.");
 	mes("<ITEMLINK>Khalitzburg Knight Card<INFO>4609</INFO></ITEMLINK>");
 	next;
-	setarray .@item[0], Coagulated_Spell, Contaminated_Magic;
+	setarray .@item[0], Coagulated_Spell, Corrupted_Charm;
 	setarray .@cost[0], 5000, 100;
 	.@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000");
 	switch (.@select) {
@@ -2750,7 +2750,7 @@ glast_01,192,273,3	script	Khalitzburg Knight#1a	4_F_KHALITZBURG,{
 			close;
 		}
 		delitem .@item, .@cost;
-		getitem Khalitzburg_Knight_Card, 1;
+		getitem Khali_Knightage_Card, 1;
 		close;
 	}
 }
diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt
index 08fe3b71b..b1a8f3c10 100644
--- a/npc/re/instances/ghost_palace.txt
+++ b/npc/re/instances/ghost_palace.txt
@@ -318,9 +318,9 @@ OnInstanceInit:
 			"Everything will be vanished...");
 		close2();
 		if (first_time_gpmission)
-			getitem Gray_Piece, 1;
+			getitem(Gray_Shard, 1);
 		if (!first_time_gpmission) {
-			getitem Gray_Piece, 2;
+			getitem(Gray_Shard, 2);
 			getexp(900000, 500000);
 			++first_time_gpmission;
 		}
@@ -705,9 +705,10 @@ OnInstanceInit:
 	mes("The cursed knight...\r"
 		"Please help me save the soul of Sakray.");
 	next;
-	setarray .@items_list, Thanatos_Sword, Thanatos_Great_Sword, Thanatos_Spear, Thanatos_Long_Spear, Thanatos_Staff, Thanatos_Two-Handed_Staff, Thanatos_Bow, 
-							Thanatos_Dagger, Thanatos_Katar, Thanatos_Knuckles, Thanatos_Hammer, Thanatos_Axe, Thanatos_Violin, Thanatos_Whip, Gray_Shield, 
-							Gray_Armor, Gray_Robe, Gray_Cloak, Boots_of_Gray, Gray_Helmet;
+	setarray(.@items_list,
+	         Thanos_Sword, Thanos_Great_Sword, Thanos_Spear, Thanos_Long_Spear, Thanos_Staff, Thanos_Rod, Thanos_Bow,
+	         Thanos_Dagger, Thanos_Katar, Thanos_Knuckle, Thanos_Hammer, Thanos_Axe, Thanos_Violin, Thanos_Whip, Shield_Of_Gray,
+	         Armor_Of_Gray, Gray_Robe, Cloak_Of_Gray, Boots_Of_Gray, Gray_Helmet);
 
 	setarray .@cost, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 100, 100, 100, 100, 100, 100;
 	.@menulist$ = "";
@@ -734,7 +735,7 @@ OnInstanceInit:
 			break;
 		case 2:
 			next;
-			if (countitem(Gray_Piece) < .@cost[.@choice]) {
+			if (countitem(Gray_Shard) < .@cost[.@choice]) {
 				mes("[King]");
 				mes("You don't have enough Gray Shards.");
 				mesf("I need %d Gray Shards to make a ^FF0000%s.^000000", .@cost[.@choice], getitemname(.@items_list[.@choice]));
@@ -755,7 +756,7 @@ OnInstanceInit:
 			mes("[King]");
 			mes("The power requires a sacrifice.\r"
 				"Please be careful...");
-			delitem Gray_Piece, .@cost[.@choice];
+			delitem(Gray_Shard, .@cost[.@choice]);
 			getitem .@items_list[.@choice], 1;
 			close();
 		}
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index 6164a0994..bee91f382 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -123,8 +123,8 @@ int_land,58,69,5	script	Sailor#int_land	4W_SAILOR,{
 		mes("I'll let you know when we set sail~!");
 		close();
 	} else {
-		if (countitem(Lumber) >= 2) {
-			delitem(Lumber, countitem(Lumber));
+		if (countitem(Wood) >= 2) {
+			delitem(Wood, countitem(Wood));
 			completequest(21002);
 			mes("[Sailor]");
 			mes("Unbelievable, perfect! Any chance you want to join my crew?");
@@ -2646,8 +2646,8 @@ iz_ac01,100,39,5	script	Academy Receptionist#1	4_F_01,{
 				getitem(Novice_Egg_Cap, 1); // Novice_Egg_Cap
 				getitem(Novice_Knife, 1); // Novice_Knife
 				getitem(Novice_Guard, 1); // Novice_Guard
-				getitem(Criatura_Academy_Hat, 1); // Criatura_Academy_Hat
-				getitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon
+				getitem(Cryptura_Academy_Hat, 1);
+				getitem(Cryptura_Hair_Coupon, 1);
 				getitem(Novice_Potion, 300); // Novice_Potion
 				next();
 				mes("[Receptionist]");
@@ -5208,7 +5208,7 @@ new_1-3,99,169,3	script	Friendly Poring#ac	4_PORING,{
 		cutin("", 255);
 		completequest(2295);
 		setquest(2296);
-		getitem(Little_Unripe_Apple, 5); // Little_Unripe_Apple
+		getitem(Unripe_Apple2, 5);
 		close();
 	} else if (questprogress(2296) == 1) {
 		if (countitem(Novice_Poring_Egg) > 0) {
@@ -6111,7 +6111,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 			}
 			close();
 		case 2:
-			if (!countitem(Criatura_Hair_Coupon)) {
+			if (!countitem(Cryptura_Hair_Coupon)) {
 				mes("[Otter Samssoon]");
 				mes("Come on.. Honey~");
 				mes("You should bring ^ff0000'Criatura Hair Coupon'^000000 for changing hair...");
@@ -6192,7 +6192,7 @@ iz_ac01,69,36,3	script	Otter Samssoon#ac	4W_SAILOR,{
 				mes("- Chikak, crack, crack.. -");
 				mes("- Snap, snap, snap.. Crack -");
 				next();
-				delitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon
+				delitem(Cryptura_Hair_Coupon, 1);
 				cutin("", 255);
 				mes("[Otter Samssoon]");
 				mes("Oh my! Oh my! Oh my!");
diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt
index b714dd71d..e5ee13ffb 100644
--- a/npc/re/merchants/coin_exchange.txt
+++ b/npc/re/merchants/coin_exchange.txt
@@ -1139,7 +1139,7 @@ ecl_in01,67,39,4	script	Replication Expert Paltu	4_M_FAIRYKID4,{
 							C_Assassin_Mask_,
 							C_Elven_Ears,
 							C_Hahoe_Mask,
-							C_Boy's_Cap;
+							C_Boys_Cap;
 	if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10))
 		.@item_check =1;
 
diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt
index 54155e8c4..d8f7594b2 100644
--- a/npc/re/merchants/shops.txt
+++ b/npc/re/merchants/shops.txt
@@ -547,42 +547,42 @@ OnInit:
 
 prontera,92,209,4	trader	Rebellion Weapon Vending	2_VENDING_MACHINE1,{
 OnInit:
-	sellitem Heaven's_Feather_and_Hell's_Fire;
-	sellitem Altea_and_Ares;
-	sellitem Color_Scope;
+	sellitem H_FEATHER_H_FIRE;
+	sellitem ALTAIR_ARES;
+	sellitem COLORSCOPE;
 	sellitem RAG203;
-	sellitem Death_Fire;
-	sellitem Rolling_Thunder;
-	sellitem Peace_Breaker;
-	sellitem Mini_Mei;
-	sellitem Tempest;
-	sellitem End_Of_The_Horizon;
-	sellitem South_Cross;
+	sellitem DEATHFIRE;
+	sellitem R_THUNDER;
+	sellitem P_BREAKER;
+	sellitem MINIMAY;
+	sellitem TEMPEST;
+	sellitem END_OF_HORIZON;
+	sellitem Southern_Cross_R;
 }
 
 prontera,96,209,4	trader	Rebellion Prop Vending	2_VENDING_MACHINE1,{
 OnInit:
-	sellitem Slug_Ammunition_L;
-	sellitem Slug_Ammunition_M;
-	sellitem Slug_Ammunition_H;
-	sellitem Full_Metal_Jacket;
-	sellitem Projection_Landmines;
+	sellitem Slug_Bullet_1;
+	sellitem Slug_Bullet_2;
+	sellitem Slug_Bullet_3;
+	sellitem Fullmetal_Jacket_Bullet;
+	sellitem Mine_Projectile;
 	sellitem Dragon_Tail_Missile;
 	sellitem Special_Alloy_Trap;
 	sellitem Bullet;
 	sellitem Silver_Bullet_;
 	sellitem Shell_Of_Blood_;
-	sellitem Armor_Piercing_Bullet;
-	sellitem Blazing_Bullet;
+	sellitem AP_Ammo;
+	sellitem Blaze_Bullet;
 	sellitem Freezing_Bullet;
-	sellitem Lightning_Bullet;
-	sellitem Magic_Stone_Bullet;
-	sellitem Purifying_Bullet;
-	sellitem Incendiary_Grenade;
-	sellitem Lightning_Grenade;
-	sellitem Poison_Grenade;
-	sellitem Flash_Grenade;
-	sellitem Cyro_Grenade;
+	sellitem Electric_Shock_Bullet;
+	sellitem Magical_Stone_Bullet;
+	sellitem Sanctified_Bullet;
+	sellitem Flare_Sphere_;
+	sellitem Lighting_Sphere_;
+	sellitem Poison_Sphere_;
+	sellitem Blind_Sphere_;
+	sellitem Freezing_Sphere_;
 }
 
 //== Morroc ===============================================
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 460960d72..2d72b3541 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -709,7 +709,7 @@ OnInit:
 	tradertype(NST_CASH);
 	sellitem Blue_Potion_Box,5;
 	sellitem F_Neuralizer_Box,400;
-	sellitem FPr_Reset_Stone_Box,100;
+	sellitem FPremium_Reset_Stone_Box,100;
 	sellitem F_Abrasive_Box10,75;
 	sellitem F_G_O_I_Box10,25;
 	sellitem Greed_Scroll_Box_30,30;
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index f1abf56aa..bbf074581 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -2807,7 +2807,7 @@ ecl_in04,226,231,4	script	Du Lian#ep14_2in2	4_M_REDMAN,{
 		emotion e_dots,0,"Alp Ocart#ep14_2in2";
 		cutin "bu_alp2",2;
 		ep14_2_oliver = 30;
-		getitem C_Oliver_Wolf_Hood,1;
+		getitem(Oliver_Wolf_Hood, 1);
 		completequest 11337;
 		close2;
 		cutin "",255;
@@ -2949,7 +2949,7 @@ ecl_in04,224,234,4	script	Mark Esha#ep14_2in2	4_M_BLUEMAN,{
 		emotion e_dots,0,"Alp Ocart#ep14_2in2";
 		cutin "bu_alp2",2;
 		ep14_2_oliver = 30;
-		getitem C_Oliver_Wolf_Hood,1;
+		getitem(Oliver_Wolf_Hood, 1);
 		completequest 11337;
 		close2;
 		cutin "",255;
@@ -3094,7 +3094,7 @@ ecl_in04,223,234,4	script	Maggi Steen#ep14_2in2	4_F_PINKWOMAN,{
 		emotion e_dots,0,"Alp Ocart#ep14_2in2";
 		cutin "bu_alp2",2;
 		ep14_2_oliver = 30;
-		getitem C_Oliver_Wolf_Hood,1;
+		getitem(Oliver_Wolf_Hood, 1);
 		completequest 11337;
 		close2;
 		cutin "",255;
@@ -3230,7 +3230,7 @@ ecl_in04,223,230,4	script	Alp Ocart#ep14_2in2	4_M_BLACKMAN,{
 		emotion e_dots;
 		cutin "bu_alp2",2;
 		ep14_2_oliver = 30;
-		getitem C_Oliver_Wolf_Hood,1;
+		getitem(Oliver_Wolf_Hood, 1);
 		completequest 11337;
 		close2;
 		cutin "",255;