Replaced some unsupported symbols in AegisNames (step 2)

This removes the remaining unsupported symbols (despite they being
official names) in AegisNames: The apostrophe (`'`) sign is suppressed.

The full replacement rules (cumulative with the step 1 commit) are thus:

- Any apostrophe is suppressed.
- Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`).
- If the replaced symbol is at a word boundary (beginning or end of the
  string, or next to another underscore), it is suppressed instead.
- If the replacement causes an AegisName conflict, underscores are
  appended appropriately.

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

7 files changed, 345 insertions, 345 deletions

diff --git a/db/pre-re/item_chain.conf b/db/pre-re/item_chain.conf
index 892686271..a2e4efff4 100644
--- a/db/pre-re/item_chain.conf
+++ b/db/pre-re/item_chain.conf
@@ -91,7 +91,7 @@ ITMCHAIN_HEAL: {
 	Novice_Potion: 50
 	Nice_Sweet_Potato: 50
 	Candy: 100
-	ID528: 200 //Monster's_Feed
+	Monsters_Feed: 200
 	Popped_Rice: 600
 }
 
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 7dfe7ed14..ed400e270 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -387,7 +387,7 @@ item_db: (
 },
 {
 	Id: 528
-	AegisName: "Monster's_Feed"
+	AegisName: "Monsters_Feed"
 	Name: "Monster's Feed"
 	Type: 0
 	Buy: 60
@@ -510,7 +510,7 @@ item_db: (
 },
 {
 	Id: 540
-	AegisName: "Falcon's_Feed"
+	AegisName: "Falcons_Feed"
 	Name: "Falcon Food"
 	Type: 0
 	Buy: 2000
@@ -519,7 +519,7 @@ item_db: (
 },
 {
 	Id: 541
-	AegisName: "Pecopeco's_Feed"
+	AegisName: "Pecopecos_Feed"
 	Name: "PecoPeco Food"
 	Type: 0
 	Buy: 3000
@@ -981,7 +981,7 @@ item_db: (
 },
 {
 	Id: 586
-	AegisName: "Mother's_Cake"
+	AegisName: "Mothers_Cake"
 	Name: "Mother's Cake"
 	Type: 0
 	Buy: 20
@@ -2759,7 +2759,7 @@ item_db: (
 },
 {
 	Id: 904
-	AegisName: "Scorpion's_Tail"
+	AegisName: "Scorpions_Tail"
 	Name: "Scorpion Tail"
 	Type: 3
 	Buy: 124
@@ -2894,7 +2894,7 @@ item_db: (
 },
 {
 	Id: 919
-	AegisName: "Animal's_Skin"
+	AegisName: "Animals_Skin"
 	Name: "Animal Skin"
 	Type: 3
 	Buy: 36
@@ -3065,7 +3065,7 @@ item_db: (
 },
 {
 	Id: 940
-	AegisName: "Grasshopper's_Leg"
+	AegisName: "Grasshoppers_Leg"
 	Name: "Grasshopper's Leg"
 	Type: 3
 	Buy: 36
@@ -3119,7 +3119,7 @@ item_db: (
 },
 {
 	Id: 946
-	AegisName: "Snail's_Shell"
+	AegisName: "Snails_Shell"
 	Name: "Snail's Shell"
 	Type: 3
 	Buy: 64
@@ -3137,7 +3137,7 @@ item_db: (
 },
 {
 	Id: 948
-	AegisName: "Bear's_Foot"
+	AegisName: "Bears_Foot"
 	Name: "Bear's Footskin"
 	Type: 3
 	Buy: 174
@@ -3730,7 +3730,7 @@ item_db: (
 },
 {
 	Id: 1015
-	AegisName: "Thin_N'_Long_Tongue"
+	AegisName: "Thin_N_Long_Tongue"
 	Name: "Tongue"
 	Type: 3
 	Buy: 528
@@ -3847,7 +3847,7 @@ item_db: (
 },
 {
 	Id: 1028
-	AegisName: "Wild_Boar's_Mane"
+	AegisName: "Wild_Boars_Mane"
 	Name: "Mane"
 	Type: 3
 	Buy: 196
@@ -3856,7 +3856,7 @@ item_db: (
 },
 {
 	Id: 1029
-	AegisName: "Tiger's_Skin"
+	AegisName: "Tigers_Skin"
 	Name: "Tiger Skin"
 	Type: 3
 	Buy: 548
@@ -3955,7 +3955,7 @@ item_db: (
 },
 {
 	Id: 1040
-	AegisName: "Elder_Pixie's_Beard"
+	AegisName: "Elder_Pixies_Beard"
 	Name: "Elder Pixie's Moustache"
 	Type: 3
 	Buy: 232
@@ -4323,7 +4323,7 @@ item_db: (
 },
 {
 	Id: 1084
-	AegisName: "Kapra's_Pass"
+	AegisName: "Kapras_Pass"
 	Name: "Kafra Pass"
 	Type: 3
 	Weight: 10
@@ -7788,7 +7788,7 @@ item_db: (
 },
 {
 	Id: 1229
-	AegisName: "Mama's_Knife"
+	AegisName: "Mamas_Knife"
 	Name: "Kitchen Knife"
 	Type: 4
 	Buy: 20
@@ -8395,7 +8395,7 @@ item_db: (
 },
 {
 	Id: 1249
-	AegisName: "Fisherman's_Dagger"
+	AegisName: "Fishermans_Dagger"
 	Name: "Fisherman's Dagger"
 	Type: 4
 	Buy: 10000
@@ -12061,7 +12061,7 @@ item_db: (
 },
 {
 	Id: 1469
-	AegisName: "Longinus's_Spear"
+	AegisName: "Longinuss_Spear"
 	Name: "Longinus's Spear"
 	Type: 4
 	Buy: 20
@@ -14083,7 +14083,7 @@ item_db: (
 },
 {
 	Id: 1558
-	AegisName: "Girl's_Diary"
+	AegisName: "Girls_Diary"
 	Name: "Girl's Diary"
 	Type: 4
 	Buy: 1500
@@ -15345,7 +15345,7 @@ item_db: (
 },
 {
 	Id: 1621
-	AegisName: "Hypnotist's_Staff"
+	AegisName: "Hypnotists_Staff"
 	Name: "Hypnotist's Staff"
 	Type: 4
 	Buy: 43000
@@ -15367,7 +15367,7 @@ item_db: (
 },
 {
 	Id: 1622
-	AegisName: "Hypnotist's_Staff_"
+	AegisName: "Hypnotists_Staff_"
 	Name: "Hypnotist's Staff"
 	Type: 4
 	Buy: 20
@@ -16176,7 +16176,7 @@ item_db: (
 },
 {
 	Id: 1646
-	AegisName: "La'cryma_Stick"
+	AegisName: "Lacryma_Stick"
 	Name: "La'cryma Stick"
 	Type: 4
 	Buy: 20
@@ -19541,7 +19541,7 @@ item_db: (
 },
 {
 	Id: 1970
-	AegisName: "Queen's_Whip"
+	AegisName: "Queens_Whip"
 	Name: "Queen's Whip"
 	Type: 4
 	Buy: 20
@@ -19675,7 +19675,7 @@ item_db: (
 },
 {
 	Id: 1976
-	AegisName: "Queen's_Whip_"
+	AegisName: "Queens_Whip_"
 	Name: "Queen's Whip"
 	Type: 4
 	Buy: 20
@@ -20390,7 +20390,7 @@ item_db: (
 },
 {
 	Id: 2115
-	AegisName: "Valkyrja's_Shield"
+	AegisName: "Valkyrjas_Shield"
 	Name: "Valkyrja's Shield"
 	Type: 5
 	Buy: 30000
@@ -20414,7 +20414,7 @@ item_db: (
 },
 {
 	Id: 2116
-	AegisName: "Angel's_Safeguard"
+	AegisName: "Angels_Safeguard"
 	Name: "Angelic Guard"
 	Type: 5
 	Buy: 10000
@@ -20872,7 +20872,7 @@ item_db: (
 },
 {
 	Id: 2137
-	AegisName: "Valkyrja's_Shield_C"
+	AegisName: "Valkyrjas_Shield_C"
 	Name: "Neo Valkyrja's Shield"
 	Type: 5
 	Def: 5
@@ -21025,7 +21025,7 @@ item_db: (
 },
 {
 	Id: 2205
-	AegisName: "Diver's_Goggles"
+	AegisName: "Divers_Goggles"
 	Name: "Diver Goggles"
 	Type: 5
 	Buy: 3500
@@ -21521,7 +21521,7 @@ item_db: (
 },
 {
 	Id: 2236
-	AegisName: "Santa's_Hat"
+	AegisName: "Santas_Hat"
 	Name: "Santa Hat"
 	Type: 5
 	Buy: 20
@@ -21620,7 +21620,7 @@ item_db: (
 },
 {
 	Id: 2244
-	AegisName: "Big_Sis'_Ribbon"
+	AegisName: "Big_Sis_Ribbon"
 	Name: "Big Ribbon"
 	Type: 5
 	Buy: 15000
@@ -21668,7 +21668,7 @@ item_db: (
 },
 {
 	Id: 2247
-	AegisName: "Oldman's_Romance"
+	AegisName: "Oldmans_Romance"
 	Name: "Romantic Gent"
 	Type: 5
 	Buy: 15000
@@ -22540,7 +22540,7 @@ item_db: (
 },
 {
 	Id: 2306
-	AegisName: "Adventurere's_Suit_"
+	AegisName: "Adventureres_Suit_"
 	Name: "Adventurer's Suit"
 	Type: 5
 	Buy: 1000
@@ -23376,7 +23376,7 @@ item_db: (
 },
 {
 	Id: 2353
-	AegisName: "Odin's_Blessing"
+	AegisName: "Odins_Blessing"
 	Name: "Odin's Blessing"
 	Type: 5
 	Buy: 30000
@@ -23392,7 +23392,7 @@ item_db: (
 },
 {
 	Id: 2354
-	AegisName: "Goibne's_Armor"
+	AegisName: "Goibnes_Armor"
 	Name: "Goibne's Armor"
 	Type: 5
 	Buy: 50000
@@ -23411,7 +23411,7 @@ item_db: (
 },
 {
 	Id: 2355
-	AegisName: "Angel's_Protection"
+	AegisName: "Angels_Protection"
 	Name: "Angelic Protection"
 	Type: 5
 	Buy: 10000
@@ -24343,7 +24343,7 @@ item_db: (
 },
 {
 	Id: 2393
-	AegisName: "N_Adventurer's_Suit"
+	AegisName: "N_Adventurers_Suit"
 	Name: "Novice Adventurer's Suit"
 	Type: 5
 	Def: 8
@@ -24785,7 +24785,7 @@ item_db: (
 },
 {
 	Id: 2418
-	AegisName: "Vidar's_Boots"
+	AegisName: "Vidars_Boots"
 	Name: "Vidar's Boots"
 	Type: 5
 	Buy: 30000
@@ -24804,7 +24804,7 @@ item_db: (
 },
 {
 	Id: 2419
-	AegisName: "Goibne's_Combat_Boots"
+	AegisName: "Goibnes_Combat_Boots"
 	Name: "Goibne's Greaves"
 	Type: 5
 	Buy: 30000
@@ -24824,7 +24824,7 @@ item_db: (
 },
 {
 	Id: 2420
-	AegisName: "Angel's_Arrival"
+	AegisName: "Angels_Arrival"
 	Name: "Angel's Reincarnation"
 	Type: 5
 	Buy: 10000
@@ -25684,7 +25684,7 @@ item_db: (
 },
 {
 	Id: 2511
-	AegisName: "Skeleton's_Cape"
+	AegisName: "Skeletons_Cape"
 	Name: "Skeleton Manteau"
 	Type: 5
 	Buy: 5000
@@ -25799,7 +25799,7 @@ item_db: (
 },
 {
 	Id: 2517
-	AegisName: "Vali's_Manteau"
+	AegisName: "Valis_Manteau"
 	Name: "Vali's Manteau"
 	Type: 5
 	Buy: 30000
@@ -25815,7 +25815,7 @@ item_db: (
 },
 {
 	Id: 2518
-	AegisName: "Morpheus's_Shawl"
+	AegisName: "Morpheuss_Shawl"
 	Name: "Morpheus's Shawl"
 	Type: 5
 	Buy: 30000
@@ -25834,7 +25834,7 @@ item_db: (
 },
 {
 	Id: 2519
-	AegisName: "Morrigane's_Manteau"
+	AegisName: "Morriganes_Manteau"
 	Name: "Morrigane's Manteau"
 	Type: 5
 	Buy: 30000
@@ -25853,7 +25853,7 @@ item_db: (
 },
 {
 	Id: 2520
-	AegisName: "Goibne's_Shoulder_Arms"
+	AegisName: "Goibnes_Shoulder_Arms"
 	Name: "Goibne's Spaulders"
 	Type: 5
 	Buy: 30000
@@ -25873,7 +25873,7 @@ item_db: (
 },
 {
 	Id: 2521
-	AegisName: "Angel's_Warmth"
+	AegisName: "Angels_Warmth"
 	Name: "Angelic Cardigan"
 	Type: 5
 	Buy: 10000
@@ -26512,7 +26512,7 @@ item_db: (
 },
 {
 	Id: 2550
-	AegisName: "Fisher's_Muffler"
+	AegisName: "Fishers_Muffler"
 	Name: "Fisher's Muffler"
 	Type: 5
 	Buy: 20
@@ -26870,7 +26870,7 @@ item_db: (
 },
 {
 	Id: 2618
-	AegisName: "Matyr's_Flea_Guard"
+	AegisName: "Matyrs_Flea_Guard"
 	Name: "Matyr's Leash"
 	Type: 5
 	Buy: 2
@@ -27291,7 +27291,7 @@ item_db: (
 },
 {
 	Id: 2642
-	AegisName: "Serin's_Gold_Ring"
+	AegisName: "Serins_Gold_Ring"
 	Name: "Serin's Gold Ring"
 	Type: 5
 	Buy: 20
@@ -27310,7 +27310,7 @@ item_db: (
 },
 {
 	Id: 2643
-	AegisName: "Serin's_Gold_Ring_"
+	AegisName: "Serins_Gold_Ring_"
 	Name: "Serin's Gold Ring"
 	Type: 5
 	Buy: 45000
@@ -27394,7 +27394,7 @@ item_db: (
 },
 {
 	Id: 2648
-	AegisName: "Morpheus's_Ring"
+	AegisName: "Morpheuss_Ring"
 	Name: "Morpheus's Ring"
 	Type: 5
 	Buy: 30000
@@ -27413,7 +27413,7 @@ item_db: (
 },
 {
 	Id: 2649
-	AegisName: "Morpheus's_Armlet"
+	AegisName: "Morpheuss_Armlet"
 	Name: "Morpheus's Bracelet"
 	Type: 5
 	Buy: 30000
@@ -27432,7 +27432,7 @@ item_db: (
 },
 {
 	Id: 2650
-	AegisName: "Morrigane's_Belt"
+	AegisName: "Morriganes_Belt"
 	Name: "Morrigane's Belt"
 	Type: 5
 	Buy: 30000
@@ -27451,7 +27451,7 @@ item_db: (
 },
 {
 	Id: 2651
-	AegisName: "Morrigane's_Pendant"
+	AegisName: "Morriganes_Pendant"
 	Name: "Morrigane's Pendant"
 	Type: 5
 	Buy: 30000
@@ -27496,7 +27496,7 @@ item_db: (
 },
 {
 	Id: 2654
-	AegisName: "Shinobi's_Sash"
+	AegisName: "Shinobis_Sash"
 	Name: "Shinobi Sash"
 	Type: 5
 	Buy: 20000
@@ -27807,7 +27807,7 @@ item_db: (
 },
 {
 	Id: 2668
-	AegisName: "Women's_Glory"
+	AegisName: "Womens_Glory"
 	Name: "Woman Glory"
 	Type: 5
 	Weight: 500
@@ -30196,7 +30196,7 @@ item_db: (
 },
 {
 	Id: 2781
-	AegisName: "Aumdura's_Grace"
+	AegisName: "Aumduras_Grace"
 	Name: "Aumdura's Benefit"
 	Type: 5
 	Weight: 100
@@ -37557,7 +37557,7 @@ item_db: (
 },
 {
 	Id: 5016
-	AegisName: "Boy's_Cap"
+	AegisName: "Boys_Cap"
 	Name: "Boy's Cap"
 	Type: 5
 	Buy: 20
@@ -38032,7 +38032,7 @@ item_db: (
 },
 {
 	Id: 5044
-	AegisName: "Devil's_Wing"
+	AegisName: "Devils_Wing"
 	Name: "Evil Wing Ears"
 	Type: 5
 	Buy: 20
@@ -38375,7 +38375,7 @@ item_db: (
 },
 {
 	Id: 5068
-	AegisName: "Ear_Of_Devil's_Wing"
+	AegisName: "Ear_Of_Devils_Wing"
 	Name: "Evil Wing Ears"
 	Type: 5
 	Buy: 20
@@ -38476,7 +38476,7 @@ item_db: (
 },
 {
 	Id: 5074
-	AegisName: "Ear_Of_Angel's_Wing"
+	AegisName: "Ear_Of_Angels_Wing"
 	Name: "Angel Wing Ears"
 	Type: 5
 	Buy: 20
@@ -39240,7 +39240,7 @@ item_db: (
 },
 {
 	Id: 5126
-	AegisName: "Morpheus's_Hood"
+	AegisName: "Morpheuss_Hood"
 	Name: "Morpheus's Hood"
 	Type: 5
 	Buy: 30000
@@ -39257,7 +39257,7 @@ item_db: (
 },
 {
 	Id: 5127
-	AegisName: "Morrigane's_Helm"
+	AegisName: "Morriganes_Helm"
 	Name: "Morrigane's Helm"
 	Type: 5
 	Buy: 30000
@@ -39277,7 +39277,7 @@ item_db: (
 },
 {
 	Id: 5128
-	AegisName: "Goibne's_Helmet"
+	AegisName: "Goibnes_Helmet"
 	Name: "Goibne's Helm"
 	Type: 5
 	Buy: 30000
@@ -39437,7 +39437,7 @@ item_db: (
 },
 {
 	Id: 5136
-	AegisName: "Santa's_Hat_"
+	AegisName: "Santas_Hat_"
 	Name: "Antonio's Santa Hat"
 	Type: 5
 	Buy: 20
@@ -42636,7 +42636,7 @@ item_db: (
 },
 {
 	Id: 5307
-	AegisName: "Carmen_Miranda's_Hat"
+	AegisName: "Carmen_Mirandas_Hat"
 	Name: "Carmen Miranda's Hat"
 	Type: 5
 	Buy: 20
@@ -43379,7 +43379,7 @@ item_db: (
 },
 {
 	Id: 5348
-	AegisName: "Big_Sis'_Ribbon_"
+	AegisName: "Big_Sis_Ribbon_"
 	Name: "Big Ribbon"
 	Type: 5
 	Buy: 15000
@@ -43396,7 +43396,7 @@ item_db: (
 },
 {
 	Id: 5349
-	AegisName: "Boy's_Cap_"
+	AegisName: "Boys_Cap_"
 	Name: "Boy's Cap"
 	Type: 5
 	Buy: 20
@@ -44803,7 +44803,7 @@ item_db: (
 },
 {
 	Id: 5421
-	AegisName: "Ifrit's_Ear"
+	AegisName: "Ifrits_Ear"
 	Name: "Ears Of Ifrit"
 	Type: 5
 	Buy: 20
@@ -45056,7 +45056,7 @@ item_db: (
 },
 {
 	Id: 5436
-	AegisName: "Bride's_Corolla"
+	AegisName: "Brides_Corolla"
 	Name: "Bride's Corolla"
 	Type: 5
 	Buy: 20
@@ -45857,7 +45857,7 @@ item_db: (
 },
 {
 	Id: 5479
-	AegisName: "Shaman's_Hair_Ornament"
+	AegisName: "Shamans_Hair_Ornament"
 	Name: "Shaman's Hair Decoration"
 	Type: 5
 	Buy: 20
@@ -46072,7 +46072,7 @@ item_db: (
 },
 {
 	Id: 5492
-	AegisName: "Boy's_Cap_I"
+	AegisName: "Boys_Cap_I"
 	Name: "Student Cap"
 	Type: 5
 	Def: 5
@@ -46287,7 +46287,7 @@ item_db: (
 },
 {
 	Id: 5501
-	AegisName: "Pirate's_Pride"
+	AegisName: "Pirates_Pride"
 	Name: "Pirate's Pride"
 	Type: 5
 	Weight: 100
@@ -46310,7 +46310,7 @@ item_db: (
 },
 {
 	Id: 5502
-	AegisName: "Necromencer's_Hood"
+	AegisName: "Necromencers_Hood"
 	Name: "Necromancer's Hood"
 	Type: 5
 	Weight: 500
@@ -46822,7 +46822,7 @@ item_db: (
 },
 {
 	Id: 5529
-	AegisName: "Evil's_Bone_Hat"
+	AegisName: "Evils_Bone_Hat"
 	Name: "Satanic Bone Helm"
 	Type: 5
 	Buy: 20
@@ -47766,7 +47766,7 @@ item_db: (
 },
 {
 	Id: 5579
-	AegisName: "Wanderer's_Sakkat"
+	AegisName: "Wanderers_Sakkat"
 	Name: "Wanderer's Sakkat"
 	Type: 5
 	Buy: 20
@@ -48018,7 +48018,7 @@ item_db: (
 */
 {
 	Id: 5592
-	AegisName: "Sigrun's_Wing"
+	AegisName: "Sigruns_Wing"
 	Name: "Sigrun's Wings"
 	Type: 5
 	Buy: 20
@@ -53112,7 +53112,7 @@ item_db: (
 },
 {
 	Id: 6070
-	AegisName: "Shaman's_Old_Paper"
+	AegisName: "Shamans_Old_Paper"
 	Name: "Shaman's Document"
 	Type: 3
 	Weight: 10
@@ -53160,7 +53160,7 @@ item_db: (
 },
 {
 	Id: 6073
-	AegisName: "Dragon's_Mane"
+	AegisName: "Dragons_Mane"
 	Name: "Dragon's Mane"
 	Type: 3
 	BuyingStore: true
@@ -53176,7 +53176,7 @@ item_db: (
 },
 {
 	Id: 6074
-	AegisName: "Bazett's_Order"
+	AegisName: "Bazetts_Order"
 	Name: "Bazett's Order"
 	Type: 3
 	Trade: {
@@ -53758,7 +53758,7 @@ item_db: (
 },
 {
 	Id: 6124
-	AegisName: "Wolf's_Flute"
+	AegisName: "Wolfs_Flute"
 	Name: "Wolf Flute"
 	Type: 3
 	Buy: 10
@@ -56612,7 +56612,7 @@ item_db: (
 },
 {
 	Id: 7017
-	AegisName: "Executioner's_Mitten"
+	AegisName: "Executioners_Mitten"
 	Name: "Executioner's Mitten"
 	Type: 3
 	Buy: 4500
@@ -56630,7 +56630,7 @@ item_db: (
 },
 {
 	Id: 7019
-	AegisName: "Loki's_Whispers"
+	AegisName: "Lokis_Whispers"
 	Name: "Loki's Whispers"
 	Type: 3
 	Buy: 20
@@ -56639,7 +56639,7 @@ item_db: (
 },
 {
 	Id: 7020
-	AegisName: "Mother's_Nightmare"
+	AegisName: "Mothers_Nightmare"
 	Name: "Mother's Nightmare"
 	Type: 3
 	Buy: 20
@@ -56684,7 +56684,7 @@ item_db: (
 },
 {
 	Id: 7025
-	AegisName: "Lucifer's_Lament"
+	AegisName: "Lucifers_Lament"
 	Name: "Lucifer's Lament"
 	Type: 3
 	Buy: 30000
@@ -56876,7 +56876,7 @@ item_db: (
 },
 {
 	Id: 7047
-	AegisName: "Alice's_Apron"
+	AegisName: "Alices_Apron"
 	Name: "Alice's Apron"
 	Type: 3
 	Buy: 2424
@@ -57396,7 +57396,7 @@ item_db: (
 },
 {
 	Id: 7106
-	AegisName: "Goat's_Horn"
+	AegisName: "Goats_Horn"
 	Name: "Antelope Horn"
 	Type: 3
 	Buy: 672
@@ -57405,7 +57405,7 @@ item_db: (
 },
 {
 	Id: 7107
-	AegisName: "Gaoat's_Skin"
+	AegisName: "Gaoats_Skin"
 	Name: "Antelope Skin"
 	Type: 3
 	Buy: 756
@@ -57468,7 +57468,7 @@ item_db: (
 },
 {
 	Id: 7114
-	AegisName: "Tutankhamen's_Mask"
+	AegisName: "Tutankhamens_Mask"
 	Name: "Masque of Tutankhamen"
 	Type: 3
 	Buy: 10
@@ -57477,7 +57477,7 @@ item_db: (
 },
 {
 	Id: 7115
-	AegisName: "Harpy's_Feather"
+	AegisName: "Harpys_Feather"
 	Name: "Harpy Feather"
 	Type: 3
 	Buy: 1142
@@ -57486,7 +57486,7 @@ item_db: (
 },
 {
 	Id: 7116
-	AegisName: "Harpy's_Claw"
+	AegisName: "Harpys_Claw"
 	Name: "Harpy Talon"
 	Type: 3
 	Buy: 1210
@@ -57549,7 +57549,7 @@ item_db: (
 },
 {
 	Id: 7123
-	AegisName: "Dragon's_Skin"
+	AegisName: "Dragons_Skin"
 	Name: "Dragon Skin"
 	Type: 3
 	Buy: 1025
@@ -57567,7 +57567,7 @@ item_db: (
 },
 {
 	Id: 7125
-	AegisName: "Scropion's_Nipper"
+	AegisName: "Scropions_Nipper"
 	Name: "Scorpion Claw"
 	Type: 3
 	Buy: 706
@@ -57828,7 +57828,7 @@ item_db: (
 },
 {
 	Id: 7155
-	AegisName: "Poison_Toad's_Skin"
+	AegisName: "Poison_Toads_Skin"
 	Name: "Poisonous Toad Skin"
 	Type: 3
 	Buy: 280
@@ -57864,7 +57864,7 @@ item_db: (
 },
 {
 	Id: 7159
-	AegisName: "Tengu's_Nose"
+	AegisName: "Tengus_Nose"
 	Name: "Tengu Nose"
 	Type: 3
 	Buy: 400
@@ -57873,7 +57873,7 @@ item_db: (
 },
 {
 	Id: 7160
-	AegisName: "Lord's_Passable_Ticket"
+	AegisName: "Lords_Passable_Ticket"
 	Name: "Feudal Lord Permit"
 	Type: 3
 	Buy: 1
@@ -57882,7 +57882,7 @@ item_db: (
 },
 {
 	Id: 7161
-	AegisName: "Black_Bear's_Skin"
+	AegisName: "Black_Bears_Skin"
 	Name: "Black Bear Skin"
 	Type: 3
 	Buy: 384
@@ -58020,7 +58020,7 @@ item_db: (
 },
 {
 	Id: 7177
-	AegisName: "Part_Of_Star's_Sob"
+	AegisName: "Part_Of_Stars_Sob"
 	Name: "Crumb of Sobbing Starlight"
 	Type: 3
 	Trade: {
@@ -58036,7 +58036,7 @@ item_db: (
 },
 {
 	Id: 7178
-	AegisName: "Star's_Sob"
+	AegisName: "Stars_Sob"
 	Name: "Sobbing Starlight"
 	Type: 3
 	Trade: {
@@ -58308,7 +58308,7 @@ item_db: (
 },
 {
 	Id: 7209
-	AegisName: "Dullahan's_Helm"
+	AegisName: "Dullahans_Helm"
 	Name: "Helm of Dullahan"
 	Type: 3
 	Buy: 1350
@@ -59089,7 +59089,7 @@ item_db: (
 },
 {
 	Id: 7304
-	AegisName: "Witch's_Spell_Book"
+	AegisName: "Witchs_Spell_Book"
 	Name: "Witch's Spell Scroll"
 	Type: 3
 	Trade: {
@@ -59153,7 +59153,7 @@ item_db: (
 },
 {
 	Id: 7308
-	AegisName: "Witch's_Potion"
+	AegisName: "Witchs_Potion"
 	Name: "Witch's Tonic"
 	Type: 3
 	Trade: {
@@ -59624,7 +59624,7 @@ item_db: (
 },
 {
 	Id: 7351
-	AegisName: "Friend's_Diary"
+	AegisName: "Friends_Diary"
 	Name: "Friend's Diary"
 	Type: 3
 	Buy: 20
@@ -60597,7 +60597,7 @@ item_db: (
 },
 {
 	Id: 7458
-	AegisName: "Baphomet's_Horn"
+	AegisName: "Baphomets_Horn"
 	Name: "Fortune Horn"
 	Type: 3
 	Buy: 2
@@ -61295,7 +61295,7 @@ item_db: (
 },
 {
 	Id: 7518
-	AegisName: "Women's_Medal"
+	AegisName: "Womens_Medal"
 	Name: "Women's Medal"
 	Type: 3
 	Weight: 10
@@ -62221,7 +62221,7 @@ item_db: (
 },
 {
 	Id: 7594
-	AegisName: "Sonia's_Letter"
+	AegisName: "Sonias_Letter"
 	Name: "Sonia's Letter"
 	Type: 3
 	Buy: 20
@@ -64745,7 +64745,7 @@ item_db: (
 },
 {
 	Id: 7920
-	AegisName: "Hero's_Arsenal"
+	AegisName: "Heros_Arsenal"
 	Name: "He's Arsenal"
 	Type: 3
 },
@@ -64818,7 +64818,7 @@ item_db: (
 },
 {
 	Id: 7930
-	AegisName: "Cowking's_Nose_Ring"
+	AegisName: "Cowkings_Nose_Ring"
 	Name: "Devil's Cattle Ring"
 	Type: 3
 	Weight: 1000
@@ -66161,7 +66161,7 @@ item_db: (
 },
 {
 	Id: 10006
-	AegisName: "Queen's_Hair_Ornament"
+	AegisName: "Queens_Hair_Ornament"
 	Name: "Queen's Hair Ornament"
 	Type: 8
 	Buy: 20
@@ -66343,7 +66343,7 @@ item_db: (
 },
 {
 	Id: 10032
-	AegisName: "Queen's_Coronet"
+	AegisName: "Queens_Coronet"
 	Name: "Queen's Coronet"
 	Type: 8
 	Buy: 20
@@ -68898,7 +68898,7 @@ item_db: (
 },
 {
 	Id: 12136
-	AegisName: "Women's_Bundle"
+	AegisName: "Womens_Bundle"
 	Name: "Women's Bundle"
 	Type: 2
 	Weight: 100
@@ -71839,7 +71839,7 @@ item_db: (
 },
 {
 	Id: 12342
-	AegisName: "Manuk's_Opportunity"
+	AegisName: "Manuks_Opportunity"
 	Name: "Manuk's Opportunity"
 	Type: 2
 	Weight: 50
@@ -71860,7 +71860,7 @@ item_db: (
 },
 {
 	Id: 12343
-	AegisName: "Manuk's_Courage"
+	AegisName: "Manuks_Courage"
 	Name: "Manuk's Courage"
 	Type: 2
 	Weight: 50
@@ -71881,7 +71881,7 @@ item_db: (
 },
 {
 	Id: 12344
-	AegisName: "Pinguicula's_fruit_Jam"
+	AegisName: "Pinguiculas_fruit_Jam"
 	Name: "Pinguicula's Fruit Jam"
 	Type: 2
 	Weight: 50
@@ -71902,7 +71902,7 @@ item_db: (
 },
 {
 	Id: 12345
-	AegisName: "Luciola's_Honey_Jam"
+	AegisName: "Luciolas_Honey_Jam"
 	Name: "Luciola's Honey Jam"
 	Type: 2
 	Weight: 50
@@ -71952,7 +71952,7 @@ item_db: (
 },
 {
 	Id: 12348
-	AegisName: "Manuk's_Faith"
+	AegisName: "Manuks_Faith"
 	Name: "Manuk's Faith"
 	Type: 2
 	Weight: 50
@@ -71973,7 +71973,7 @@ item_db: (
 },
 {
 	Id: 12349
-	AegisName: "Cornus'_Tears"
+	AegisName: "Cornus_Tears"
 	Name: "Cornus' Tears"
 	Type: 2
 	Weight: 50
@@ -72265,7 +72265,7 @@ item_db: (
 },
 {
 	Id: 12370
-	AegisName: "Gril's_Naivety"
+	AegisName: "Grils_Naivety"
 	Name: "Girl's Naivety"
 	Type: 2
 	Trade: {
@@ -72311,7 +72311,7 @@ item_db: (
 },
 {
 	Id: 12373
-	AegisName: "Boy's_Naivety"
+	AegisName: "Boys_Naivety"
 	Name: "Boy's Pure Heart"
 	Type: 2
 	Buy: 20
@@ -72396,7 +72396,7 @@ item_db: (
 },
 {
 	Id: 12379
-	AegisName: "Pope's_Cookie"
+	AegisName: "Popes_Cookie"
 	Name: "Pope Cookie"
 	Type: 2
 	Buy: 10
@@ -81524,7 +81524,7 @@ item_db: (
 },
 {
 	Id: 13420
-	AegisName: "Honglyun's_Sword"
+	AegisName: "Honglyuns_Sword"
 	Name: "Honglyun's Sword"
 	Type: 4
 	Buy: 20
@@ -92651,7 +92651,7 @@ item_db: (
 /*
 {
 	Id: 14285
-	AegisName: "Valkyrja's_Shield_C_Box"
+	AegisName: "Valkyrjas_Shield_C_Box"
 	Name: "Balkiriah Shield Box"
 	Type: 18
 	Buy: 20
@@ -92826,7 +92826,7 @@ item_db: (
 },
 {
 	Id: 14301
-	AegisName: "Ifrit's_Ear_Box"
+	AegisName: "Ifrits_Ear_Box"
 	Name: "Ears Of Ifrit Box"
 	Type: 18
 	Buy: 20
@@ -92998,7 +92998,7 @@ item_db: (
 },
 {
 	Id: 14351
-	AegisName: "Tyr's_Blessing20_Box"
+	AegisName: "Tyrs_Blessing20_Box"
 	Name: "Tyr's Blessing 20 Box"
 	Type: 18
 	Buy: 20
@@ -93008,11 +93008,11 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem Tyr's_Blessing,20; ">
+	Script: <" getitem Tyrs_Blessing,20; ">
 },
 {
 	Id: 14352
-	AegisName: "Tyr's_Blessing50_Box"
+	AegisName: "Tyrs_Blessing50_Box"
 	Name: "Tyr's Blessing 50 Box"
 	Type: 18
 	Buy: 20
@@ -93022,7 +93022,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem Tyr's_Blessing,50; ">
+	Script: <" getitem Tyrs_Blessing,50; ">
 },
 {
 	Id: 14359
@@ -93234,7 +93234,7 @@ item_db: (
 },
 {
 	Id: 14447
-	AegisName: "Pirate's_Pride_Box"
+	AegisName: "Pirates_Pride_Box"
 	Name: "Pirate's Pride Box"
 	Type: 18
 	Buy: 20
@@ -93250,7 +93250,7 @@ item_db: (
 },
 {
 	Id: 14448
-	AegisName: "Necromencer's_Hood_Box"
+	AegisName: "Necromencers_Hood_Box"
 	Name: "Necromancer's Hood Box"
 	Type: 18
 	Buy: 20
@@ -94620,7 +94620,7 @@ item_db: (
 },
 {
 	Id: 14601
-	AegisName: "Tyr's_Blessing"
+	AegisName: "Tyrs_Blessing"
 	Name: "Tyr's Blessing"
 	Type: 2
 	Weight: 10
@@ -94812,7 +94812,7 @@ item_db: (
 },
 {
 	Id: 15001
-	AegisName: "Odin's_Blessing_I"
+	AegisName: "Odins_Blessing_I"
 	Name: "Odin's Blessing"
 	Type: 5
 	Def: 10
@@ -95018,7 +95018,7 @@ item_db: (
 },
 {
 	Id: 16135
-	AegisName: "Evil's_Bone_Hat_Box"
+	AegisName: "Evils_Bone_Hat_Box"
 	Name: "Satanic Bone Helm Box"
 	Type: 18
 	Buy: 20
@@ -95111,7 +95111,7 @@ item_db: (
 */
 /*
 	Id: 16250
-	AegisName: "Valkyrie's_Gift_Bo"
+	AegisName: "Valkyries_Gift_Bo"
 },
 */
 /*
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index 0f41879ef..d2d9c61d8 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -412,7 +412,7 @@ Gift_Box: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	("Girl's_Diary",2),
+	("Girls_Diary",2),
 	"Emperium",
 	"Steel",
 	"Old_Blue_Box",
@@ -490,7 +490,7 @@ Gift_Box_1: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary",
+	"Girls_Diary",
 )
 Gift_Box_2: (
 	"Star_Crumb",
@@ -561,7 +561,7 @@ Gift_Box_2: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	("Girl's_Diary",2),
+	("Girls_Diary",2),
 	"Emperium",
 	"Steel",
 	"Old_Blue_Box",
@@ -639,7 +639,7 @@ Gift_Box_3: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary",
+	"Girls_Diary",
 )
 Gift_Box_4: (
 	"Star_Crumb",
@@ -710,7 +710,7 @@ Gift_Box_4: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary",
+	"Girls_Diary",
 )
 Old_Blue_Box: (
 	("Guard_",3),
@@ -727,7 +727,7 @@ Old_Blue_Box: (
 	("Leather_Jacket",3),
 	("Leather_Jacket_",3),
 	("Adventure_Suit",3),
-	("Adventurere's_Suit_",3),
+	("Adventureres_Suit_",3),
 	("Mantle",3),
 	("Mantle_",3),
 	("Coat",3),
@@ -793,7 +793,7 @@ Old_Blue_Box: (
 	("Flower_Ring",3),
 	("Diamond_Ring",3),
 	("Mitten_Of_Presbyter",3),
-	("Matyr's_Flea_Guard",3),
+	("Matyrs_Flea_Guard",3),
 	("Belt",3),
 	("Novice_Armlet",3),
 	("Katana",3),
@@ -919,7 +919,7 @@ Old_Blue_Box: (
 	("Book_Of_Mother_Earth",3),
 	("Book_Of_Blazing_Sun",3),
 	("Book_Of_Gust_Of_Wind",3),
-	("Girl's_Diary",3),
+	("Girls_Diary",3),
 	("Rod",3),
 	("Rod_",3),
 	("Wand",3),
@@ -969,7 +969,7 @@ Old_Blue_Box: (
 	("Whip_",3),
 	("Sunglasses",3),
 	("Glasses",3),
-	("Diver's_Goggles",3),
+	("Divers_Goggles",3),
 	("Wedding_Veil",3),
 	("Fancy_Flower",3),
 	("Ribbon",3),
@@ -995,15 +995,15 @@ Old_Blue_Box: (
 	("Gemmed_Sallet_",3),
 	("Circlet",3),
 	("Circlet_",3),
-	("Santa's_Hat",3),
+	("Santas_Hat",3),
 	("One_Eyed_Glass",3),
 	("Granpa_Beard",3),
 	("Luxury_Sunglasses",3),
 	("Spinning_Eyes",3),
-	("Big_Sis'_Ribbon",3),
+	("Big_Sis_Ribbon",3),
 	("Sweet_Gents",3),
 	("Golden_Gear",3),
-	("Oldman's_Romance",3),
+	("Oldmans_Romance",3),
 	("Western_Grace",3),
 	("Fillet",3),
 	("Holy_Bonnet",3),
@@ -1061,7 +1061,7 @@ Old_Blue_Box: (
 	("Transparent_Headgear",3),
 	("Pacifier",3),
 	("Wig",3),
-	("Queen's_Hair_Ornament",3),
+	("Queens_Hair_Ornament",3),
 	("Silk_Ribbon",3),
 	("Punisher",3),
 	("Wild_Flower",3),
@@ -1131,7 +1131,7 @@ Old_Blue_Box: (
 	("Danggie",12),
 	("Tree_Root",12),
 	("Reptile_Tongue",12),
-	("Scorpion's_Tail",12),
+	("Scorpions_Tail",12),
 	("Stem",12),
 	("Pointed_Scale",12),
 	("Resin",12),
@@ -1146,7 +1146,7 @@ Old_Blue_Box: (
 	("Feather_Of_Birds",12),
 	("Talon",12),
 	("Sticky_Webfoot",12),
-	("Animal's_Skin",12),
+	("Animals_Skin",12),
 	("Claw_Of_Wolves",12),
 	("Mushroom_Spore",12),
 	("Orcish_Cuspid",12),
@@ -1165,15 +1165,15 @@ Old_Blue_Box: (
 	("Posionous_Canine",12),
 	("Sticky_Mucus",12),
 	("Bee_Sting",12),
-	("Grasshopper's_Leg",12),
+	("Grasshoppers_Leg",12),
 	("Nose_Ring",12),
 	("Yoyo_Tail",12),
 	("Solid_Shell",12),
 	("Horseshoe",12),
 	("Raccoon_Leaf",12),
-	("Snail's_Shell",12),
+	("Snails_Shell",12),
 	("Horn",12),
-	("Bear's_Foot",12),
+	("Bears_Foot",12),
 	("Feather",12),
 	("Heart_Of_Mermaid",12),
 	("Fin",12),
@@ -1236,7 +1236,7 @@ Old_Blue_Box: (
 	("Lizard_Scruff",12),
 	("Colorful_Shell",12),
 	("Jaws_Of_Ant",12),
-	("Thin_N'_Long_Tongue",12),
+	("Thin_N_Long_Tongue",12),
 	("Rat_Tail",12),
 	("Moustache_Of_Mole",12),
 	("Nail_Of_Mole",12),
@@ -1249,8 +1249,8 @@ Old_Blue_Box: (
 	("Spiderweb",12),
 	("Acorn",12),
 	("Porcupine_Spike",12),
-	("Wild_Boar's_Mane",12),
-	("Tiger's_Skin",12),
+	("Wild_Boars_Mane",12),
+	("Tigers_Skin",12),
 	("Limb_Of_Mantis",12),
 	("Blossom_Of_Maneater",12),
 	("Root_Of_Maneater",12),
@@ -1260,7 +1260,7 @@ Old_Blue_Box: (
 	("Dragon_Train",12),
 	("Petite_DiablOfs_Horn",12),
 	("Petite_DiablOfs_Wing",12),
-	("Elder_Pixie's_Beard",12),
+	("Elder_Pixies_Beard",12),
 	("Lantern",12),
 	("Short_Leg",12),
 	("Nail_Of_Orc",12),
@@ -1326,7 +1326,7 @@ Old_Blue_Box: (
 	("Fang_Of_Garm",12),
 	("Yarn",12),
 	("Fine_Grit",12),
-	("Alice's_Apron",12),
+	("Alices_Apron",12),
 	("Talon_Of_Griffin",12),
 	("Stone",12),
 	("Cyfar",12),
@@ -1353,26 +1353,26 @@ Old_Blue_Box: (
 	("Old_Magic_Circle",12),
 	("Sharp_Leaf",12),
 	("Peco_Wing_Feather",12),
-	("Goat's_Horn",12),
-	("Gaoat's_Skin",12),
+	("Goats_Horn",12),
+	("Gaoats_Skin",12),
 	("Boroken_Shiled_Piece",12),
 	("Shine_Spear_Blade",12),
 	("Vroken_Sword",12),
 	("Smooth_Paper",12),
 	("Fright_Paper_Blade",12),
 	("Broken_Pharaoh_Symbol",12),
-	("Tutankhamen's_Mask",12),
-	("Harpy's_Feather",12),
-	("Harpy's_Claw",12),
+	("Tutankhamens_Mask",12),
+	("Harpys_Feather",12),
+	("Harpys_Claw",12),
 	("Rent_Spell_Book",12),
 	("Rent_Scroll",12),
 	("Spawns",12),
 	("Burning_Horse_Shoe",12),
 	("Honey_Jar",12),
 	("Hot_Hair",12),
-	("Dragon's_Skin",12),
+	("Dragons_Skin",12),
 	("Sand_Lump",12),
-	("Scropion's_Nipper",12),
+	("Scropions_Nipper",12),
 	("Large_Jellopy",12),
 	("Medicine_Bowl",12),
 	("Fire_Bottle",12),
@@ -1386,12 +1386,12 @@ Old_Blue_Box: (
 	("Glossy_Hair",12),
 	("Old_Japaness_Clothes",12),
 	("Poison_Powder",12),
-	("Poison_Toad's_Skin",12),
+	("Poison_Toads_Skin",12),
 	("Broken_Shuriken",12),
 	("Black_Mask",12),
 	("Broken_Wine_Vessel",12),
-	("Tengu's_Nose",12),
-	("Black_Bear's_Skin",12),
+	("Tengus_Nose",12),
+	("Black_Bears_Skin",12),
 	("Cloud_Piece",12),
 	("Sharp_Feeler",12),
 	("Hard_Peach",12),
@@ -1426,7 +1426,7 @@ Old_Blue_Box: (
 	("Black_Kitty_Doll",12),
 	("Old_Manteau",12),
 	("Rusty_Cleaver",12),
-	("Dullahan's_Helm",12),
+	("Dullahans_Helm",12),
 	("Dullahan_Armor",12),
 	("Rojerta_Piece",12),
 	("Hanging_Doll",12),
@@ -1496,7 +1496,7 @@ Old_Blue_Box: (
 	("Holy_Water",12),
 	("Panacea",12),
 	("Royal_Jelly",12),
-	("Monster's_Feed",12),
+	("Monsters_Feed",12),
 	("Candy",12),
 	("Candy_Striper",12),
 	("Apple_Juice",12),
@@ -1590,7 +1590,7 @@ Old_Blue_Box: (
 	"Cinquedea",
 	"Kindling_Dagger",
 	"Obsidian_Dagger",
-	"Fisherman's_Dagger",
+	"Fishermans_Dagger",
 	"Jujube_Dagger",
 	"Dragon_Killer",
 	"Ginnungagap",
@@ -1602,8 +1602,8 @@ Old_Blue_Box: (
 	"Nail_Of_Loki",
 	"Bloody_Roar",
 	"Unholy_Touch",
-	"Hypnotist's_Staff",
-	"Hypnotist's_Staff_",
+	"Hypnotists_Staff",
+	"Hypnotists_Staff_",
 	"Staff_Of_Wing",
 	"Luna_Bow",
 	"Dragon_Wing",
@@ -1622,7 +1622,7 @@ Old_Blue_Box: (
 	"Coward",
 	"Coward_",
 	"Windhawk",
-	"Queen's_Whip",
+	"Queens_Whip",
 	"Oriental_Lute",
 	"Diary_Of_Great_Sage",
 	"Hardback",
@@ -1645,7 +1645,7 @@ Old_Blue_Box: (
 	"Banana_Hat",
 	"Wing_Of_Eagle",
 	"Cursed_Lucky_Brooch",
-	"Shinobi's_Sash",
+	"Shinobis_Sash",
 	"Hyper_Changer",
 	"Dark_Crystal_Fragment",
 	"Long_Limb",
@@ -1699,7 +1699,7 @@ Old_Blue_Box: (
 	"Thorny_Buckler",
 	"Orleans_Gown",
 	"Strong_Shield",
-	"Angel's_Arrival",
+	"Angels_Arrival",
 	"Magni_Cap",
 	"Censor_Bar",
 	"Inverse_Scale",
@@ -1744,7 +1744,7 @@ Old_Violet_Box: (
 	("Novice_Guard",7),
 	("Cotton_Shirt_",7),
 	("Leather_Jacket_",7),
-	("Adventurere's_Suit_",7),
+	("Adventureres_Suit_",7),
 	("Mantle_",7),
 	("Coat_",7),
 	("Mink_Coat",7),
@@ -1791,7 +1791,7 @@ Old_Violet_Box: (
 	("Flower_Ring",7),
 	("Diamond_Ring",7),
 	("Mitten_Of_Presbyter",7),
-	("Matyr's_Flea_Guard",7),
+	("Matyrs_Flea_Guard",7),
 	("Belt",7),
 	("Novice_Armlet",7),
 	("Katana_",7),
@@ -1865,7 +1865,7 @@ Old_Violet_Box: (
 	("Book_Of_Mother_Earth",7),
 	("Book_Of_Blazing_Sun",7),
 	("Book_Of_Gust_Of_Wind",7),
-	("Girl's_Diary",7),
+	("Girls_Diary",7),
 	("Rod_",7),
 	("Wand_",7),
 	("Staff_",7),
@@ -1893,7 +1893,7 @@ Old_Violet_Box: (
 	("Whip_",7),
 	("Sunglasses",7),
 	("Glasses",7),
-	("Diver's_Goggles",7),
+	("Divers_Goggles",7),
 	("Wedding_Veil",7),
 	("Fancy_Flower",7),
 	("Ribbon",7),
@@ -1919,15 +1919,15 @@ Old_Violet_Box: (
 	("Gemmed_Sallet_",7),
 	("Circlet",7),
 	("Circlet_",7),
-	("Santa's_Hat",7),
+	("Santas_Hat",7),
 	("One_Eyed_Glass",7),
 	("Granpa_Beard",7),
 	("Luxury_Sunglasses",7),
 	("Spinning_Eyes",7),
-	("Big_Sis'_Ribbon",7),
+	("Big_Sis_Ribbon",7),
 	("Sweet_Gents",7),
 	("Golden_Gear",7),
-	("Oldman's_Romance",7),
+	("Oldmans_Romance",7),
 	("Western_Grace",7),
 	("Fillet",7),
 	("Holy_Bonnet",7),
@@ -1985,7 +1985,7 @@ Old_Violet_Box: (
 	("Transparent_Headgear",7),
 	("Pacifier",7),
 	("Wig",7),
-	("Queen's_Hair_Ornament",7),
+	("Queens_Hair_Ornament",7),
 	("Silk_Ribbon",7),
 	("Punisher",7),
 	("Wild_Flower",7),
@@ -2055,7 +2055,7 @@ Old_Violet_Box: (
 	("Danggie",14),
 	("Tree_Root",14),
 	("Reptile_Tongue",14),
-	("Scorpion's_Tail",14),
+	("Scorpions_Tail",14),
 	("Stem",14),
 	("Pointed_Scale",14),
 	("Resin",14),
@@ -2070,7 +2070,7 @@ Old_Violet_Box: (
 	("Feather_Of_Birds",14),
 	("Talon",14),
 	("Sticky_Webfoot",14),
-	("Animal's_Skin",14),
+	("Animals_Skin",14),
 	("Claw_Of_Wolves",14),
 	("Mushroom_Spore",14),
 	("Orcish_Cuspid",14),
@@ -2089,15 +2089,15 @@ Old_Violet_Box: (
 	("Posionous_Canine",14),
 	("Sticky_Mucus",14),
 	("Bee_Sting",14),
-	("Grasshopper's_Leg",14),
+	("Grasshoppers_Leg",14),
 	("Nose_Ring",14),
 	("Yoyo_Tail",14),
 	("Solid_Shell",14),
 	("Horseshoe",14),
 	("Raccoon_Leaf",14),
-	("Snail's_Shell",14),
+	("Snails_Shell",14),
 	("Horn",14),
-	("Bear's_Foot",14),
+	("Bears_Foot",14),
 	("Feather",14),
 	("Heart_Of_Mermaid",14),
 	("Fin",14),
@@ -2160,7 +2160,7 @@ Old_Violet_Box: (
 	("Lizard_Scruff",14),
 	("Colorful_Shell",14),
 	("Jaws_Of_Ant",14),
-	("Thin_N'_Long_Tongue",14),
+	("Thin_N_Long_Tongue",14),
 	("Rat_Tail",14),
 	("Moustache_Of_Mole",14),
 	("Nail_Of_Mole",14),
@@ -2173,8 +2173,8 @@ Old_Violet_Box: (
 	("Spiderweb",14),
 	("Acorn",14),
 	("Porcupine_Spike",14),
-	("Wild_Boar's_Mane",14),
-	("Tiger's_Skin",14),
+	("Wild_Boars_Mane",14),
+	("Tigers_Skin",14),
 	("Limb_Of_Mantis",14),
 	("Blossom_Of_Maneater",14),
 	("Root_Of_Maneater",14),
@@ -2184,7 +2184,7 @@ Old_Violet_Box: (
 	("Dragon_Train",14),
 	("Petite_DiablOfs_Horn",14),
 	("Petite_DiablOfs_Wing",14),
-	("Elder_Pixie's_Beard",14),
+	("Elder_Pixies_Beard",14),
 	("Lantern",14),
 	("Short_Leg",14),
 	("Nail_Of_Orc",14),
@@ -2250,7 +2250,7 @@ Old_Violet_Box: (
 	("Fang_Of_Garm",14),
 	("Yarn",14),
 	("Fine_Grit",14),
-	("Alice's_Apron",14),
+	("Alices_Apron",14),
 	("Talon_Of_Griffin",14),
 	("Stone",14),
 	("Cyfar",14),
@@ -2277,26 +2277,26 @@ Old_Violet_Box: (
 	("Old_Magic_Circle",14),
 	("Sharp_Leaf",14),
 	("Peco_Wing_Feather",14),
-	("Goat's_Horn",14),
-	("Gaoat's_Skin",14),
+	("Goats_Horn",14),
+	("Gaoats_Skin",14),
 	("Boroken_Shiled_Piece",14),
 	("Shine_Spear_Blade",14),
 	("Vroken_Sword",14),
 	("Smooth_Paper",14),
 	("Fright_Paper_Blade",14),
 	("Broken_Pharaoh_Symbol",14),
-	("Tutankhamen's_Mask",14),
-	("Harpy's_Feather",14),
-	("Harpy's_Claw",14),
+	("Tutankhamens_Mask",14),
+	("Harpys_Feather",14),
+	("Harpys_Claw",14),
 	("Rent_Spell_Book",14),
 	("Rent_Scroll",14),
 	("Spawns",14),
 	("Burning_Horse_Shoe",14),
 	("Honey_Jar",14),
 	("Hot_Hair",14),
-	("Dragon's_Skin",14),
+	("Dragons_Skin",14),
 	("Sand_Lump",14),
-	("Scropion's_Nipper",14),
+	("Scropions_Nipper",14),
 	("Large_Jellopy",14),
 	("Medicine_Bowl",14),
 	("Fire_Bottle",14),
@@ -2310,12 +2310,12 @@ Old_Violet_Box: (
 	("Glossy_Hair",14),
 	("Old_Japaness_Clothes",14),
 	("Poison_Powder",14),
-	("Poison_Toad's_Skin",14),
+	("Poison_Toads_Skin",14),
 	("Broken_Shuriken",14),
 	("Black_Mask",14),
 	("Broken_Wine_Vessel",14),
-	("Tengu's_Nose",14),
-	("Black_Bear's_Skin",14),
+	("Tengus_Nose",14),
+	("Black_Bears_Skin",14),
 	("Cloud_Piece",14),
 	("Sharp_Feeler",14),
 	("Hard_Peach",14),
@@ -2350,7 +2350,7 @@ Old_Violet_Box: (
 	("Black_Kitty_Doll",14),
 	("Old_Manteau",14),
 	("Rusty_Cleaver",14),
-	("Dullahan's_Helm",14),
+	("Dullahans_Helm",14),
 	("Dullahan_Armor",14),
 	("Rojerta_Piece",14),
 	("Hanging_Doll",14),
@@ -2420,7 +2420,7 @@ Old_Violet_Box: (
 	("Holy_Water",14),
 	("Panacea",14),
 	("Royal_Jelly",14),
-	("Monster's_Feed",14),
+	("Monsters_Feed",14),
 	("Candy",14),
 	("Candy_Striper",14),
 	("Apple_Juice",14),
@@ -2532,7 +2532,7 @@ Old_Violet_Box: (
 	"Nail_Of_Loki",
 	"Bloody_Roar",
 	"Unholy_Touch",
-	"Hypnotist's_Staff_",
+	"Hypnotists_Staff_",
 	"Staff_Of_Wing",
 	"Luna_Bow",
 	"Dragon_Wing",
@@ -2550,7 +2550,7 @@ Old_Violet_Box: (
 	"Legacy_Of_Dragon",
 	"Coward_",
 	"Windhawk",
-	"Queen's_Whip",
+	"Queens_Whip",
 	"Oriental_Lute",
 	"Diary_Of_Great_Sage",
 	"Hardback",
@@ -2566,7 +2566,7 @@ Old_Violet_Box: (
 	"Banana_Hat",
 	"Wing_Of_Eagle",
 	"Cursed_Lucky_Brooch",
-	"Shinobi's_Sash",
+	"Shinobis_Sash",
 	"Bloody_Iron_Ball",
 	"Hyper_Changer",
 	"Cookbook06",
@@ -2707,7 +2707,7 @@ Set_Of_Taiming_Item: (
 	"Transparent_Headgear",
 	"Pacifier",
 	"Wig",
-	"Queen's_Hair_Ornament",
+	"Queens_Hair_Ornament",
 	"Silk_Ribbon",
 	"Punisher",
 	"Wild_Flower",
@@ -2737,7 +2737,7 @@ Accessory_Box: (
 	("Thimble_Of_Archer",10),
 	("Rosary",14),
 	("Ring",10),
-	("Matyr's_Flea_Guard",11),
+	("Matyrs_Flea_Guard",11),
 	("Belt",10),
 	("Brooch",12),
 	("Nile_Rose_",10),
@@ -2760,7 +2760,7 @@ Accessory_Box: (
 	("Red_Silk_Seal",2),
 	"Orleans_Glove",
 	"Spiritual_Ring",
-	"Shinobi's_Sash",
+	"Shinobis_Sash",
 	"Hyper_Changer",
 	("Lesser_Elemental_Ring",9),
 	"Expert_Ring",
@@ -3100,8 +3100,8 @@ Giftbox_China: (
 	"Helm_",
 	"Gemmed_Sallet_",
 	"Circlet_",
-	"Santa's_Hat",
-	"Big_Sis'_Ribbon",
+	"Santas_Hat",
+	"Big_Sis_Ribbon",
 	"Coronet",
 	"Fillet",
 	"Snowy_Horn",
@@ -3130,7 +3130,7 @@ Giftbox_China: (
 	"Viking_Helm",
 	"Cotton_Shirt_",
 	"Leather_Jacket_",
-	"Adventurere's_Suit_",
+	"Adventureres_Suit_",
 	"Mantle_",
 	"Coat_",
 	"Mink_Coat",
@@ -3328,7 +3328,7 @@ Xmas_Gift: (
 	("HandMade_Chocolate",18),
 	("HandMade_Chocolate_",18),
 	("Chocolate_Drink",18),
-	("Santa's_Hat_",12),
+	("Santas_Hat_",12),
 	("Fire_Cracker_Xmas",4),
 )
 Pierre_Treasurebox: (
@@ -3903,7 +3903,7 @@ Mysterious_Egg: (
 High_Weapon_Box: (
 	("Mail_Breaker",5),
 	("Weeder_Knife",5),
-	("Mama's_Knife",5),
+	("Mamas_Knife",5),
 	("Assasin_Dagger",5),
 	("Exercise",5),
 	("Azoth",5),
@@ -3959,7 +3959,7 @@ High_Weapon_Box: (
 	("Crescent_Scythe",5),
 	("Bill_Guisarme",5),
 	("Zephyrus",5),
-	("Longinus's_Spear",5),
+	("Longinuss_Spear",5),
 	("Brionac",5),
 	("Hell_Fire",5),
 	("Gae_Bolg",5),
@@ -3986,7 +3986,7 @@ High_Weapon_Box: (
 	("Red_Square_Bag",5),
 //unknown/unsupported - 	("16010",5),
 	("Book_Of_The_Apocalypse",5),
-	("Girl's_Diary",5),
+	("Girls_Diary",5),
 	("Legacy_Of_Dragon",5),
 	("Hardback",5),
 	("Bible_Of_Battlefield",5),
@@ -4009,9 +4009,9 @@ High_Weapon_Box: (
 	("Bladed_Whip",5),
 	("Electric_Eel",5),
 	("Sea_Witch_Foot",5),
-	("Queen's_Whip",5),
+	("Queens_Whip",5),
 	("Carrot_Whip",5),
-	("Queen's_Whip_",5),
+	("Queens_Whip_",5),
 	("Stem_Of_Nepenthes",5),
 	"Thorn_Staff",
 	"Eraser",
@@ -4523,7 +4523,7 @@ Old_Card_Album_: (
 High_Weapon_Box_: (
 	("Mail_Breaker",5),
 	("Weeder_Knife",5),
-	("Mama's_Knife",5),
+	("Mamas_Knife",5),
 	("Assasin_Dagger",5),
 	("Exercise",5),
 	("Azoth",5),
@@ -4579,7 +4579,7 @@ High_Weapon_Box_: (
 	("Crescent_Scythe",5),
 	("Bill_Guisarme",5),
 	("Zephyrus",5),
-	("Longinus's_Spear",5),
+	("Longinuss_Spear",5),
 	("Brionac",5),
 	("Hell_Fire",5),
 	("Gae_Bolg",5),
@@ -4606,7 +4606,7 @@ High_Weapon_Box_: (
 	("Red_Square_Bag",5),
 //unknown/unsupported - 	("16010",5),
 	("Book_Of_The_Apocalypse",5),
-	("Girl's_Diary",5),
+	("Girls_Diary",5),
 	("Legacy_Of_Dragon",5),
 	("Hardback",5),
 	("Bible_Of_Battlefield",5),
@@ -4629,9 +4629,9 @@ High_Weapon_Box_: (
 	("Bladed_Whip",5),
 	("Electric_Eel",5),
 	("Sea_Witch_Foot",5),
-	("Queen's_Whip",5),
+	("Queens_Whip",5),
 	("Carrot_Whip",5),
-	("Queen's_Whip_",5),
+	("Queens_Whip_",5),
 	("Stem_Of_Nepenthes",5),
 	"Thorn_Staff",
 	"Eraser",
diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf
index 0f0502c05..8e421be53 100644
--- a/db/pre-re/item_packages.conf
+++ b/db/pre-re/item_packages.conf
@@ -7861,7 +7861,7 @@ BR_Independence_Scroll: {
 		Named: true
 		Rate: 100
 	}
-	Carmen_Miranda's_Hat: {
+	Carmen_Mirandas_Hat: {
 		Random: 1
 		Named: true
 		Rate: 30
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index fecbf9bb7..82501748d 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -136,7 +136,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Boody_Red: 70
-		Scorpion's_Tail: 5500
+		Scorpions_Tail: 5500
 		Elunium_Stone: 57
 		Solid_Shell: 210
 		Fine_Grit: 100
@@ -680,8 +680,8 @@ mob_db: (
 		Claw_Of_Wolves: 9000
 		Mantle_: 10
 		Meat: 650
-		Monster's_Feed: 1050
-		Animal's_Skin: 5500
+		Monsters_Feed: 1050
+		Animals_Skin: 5500
 		Strawberry: 600
 		Wolf_Card: 1
 	}
@@ -1110,7 +1110,7 @@ mob_db: (
 		Cobold_Hair: 4000
 		Oridecon: 500
 		Elunium: 500
-		Executioner's_Mitten: 800
+		Executioners_Mitten: 800
 		Guh_Moon_Goh_: 300
 	}
 },*/
@@ -1304,7 +1304,7 @@ mob_db: (
 		Amulet: 20
 		Ninja_Suit: 1
 		Adventure_Suit: 100
-		Girl's_Diary: 5
+		Girls_Diary: 5
 		Munak_Card: 1
 	}
 },
@@ -2562,7 +2562,7 @@ mob_db: (
 	DamageMotion: 540
 	MvpExp: 0
 	Drops: {
-		Grasshopper's_Leg: 9000
+		Grasshoppers_Leg: 9000
 		Guitar_Of_Vast_Land: 10
 		Green_Feeler: 4
 		Javelin_: 80
@@ -2759,7 +2759,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Raccoon_Leaf: 5500
-		Animal's_Skin: 5500
+		Animals_Skin: 5500
 		Sweet_Potato: 800
 		Cat_Hairband: 1
 		Raccoondog_Doll: 2
@@ -2858,7 +2858,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Boody_Red: 60
-		Grasshopper's_Leg: 6500
+		Grasshoppers_Leg: 6500
 		Scell: 400
 		Elunium_Stone: 49
 		Singing_Plant: 20
@@ -2963,9 +2963,9 @@ mob_db: (
 	DamageMotion: 192
 	MvpExp: 0
 	Drops: {
-		Bear's_Foot: 9000
+		Bears_Foot: 9000
 		Poo_Poo_Hat: 5
-		Animal's_Skin: 5000
+		Animals_Skin: 5000
 		Stuffed_Doll: 80
 		Sweet_Potato: 1500
 		Honey: 450
@@ -3065,7 +3065,7 @@ mob_db: (
 		Candy_Striper: 1000
 		Red_Herb: 1000
 		Apple: 1000
-		Santa's_Hat: 100
+		Santas_Hat: 100
 		Apple: 7
 		Poring__Card: 1
 	}
@@ -3441,7 +3441,7 @@ mob_db: (
 		Crystal_Blue: 30
 		Worm_Peelings: 5500
 		Garlet: 400
-		Monster's_Feed: 500
+		Monsters_Feed: 500
 		Red_Herb: 650
 		Insect_Feeler: 450
 		Earthworm_The_Dude: 20
@@ -4288,11 +4288,11 @@ mob_db: (
 	DamageMotion: 480
 	MvpExp: 0
 	Drops: {
-		Oldman's_Romance: 50
-		Grasshopper's_Leg: 8000
+		Oldmans_Romance: 50
+		Grasshoppers_Leg: 8000
 		Azure_Jewel: 1000
 		Grasshopper_Doll: 1500
-		Angel's_Arrival: 1000
+		Angels_Arrival: 1000
 		Center_Potion: 700
 		Guitar_Of_Gentle_Breeze: 10
 		Vocal_Card: 1
@@ -4342,7 +4342,7 @@ mob_db: (
 	DamageMotion: 432
 	MvpExp: 0
 	Drops: {
-		Big_Sis'_Ribbon: 50
+		Big_Sis_Ribbon: 50
 		Honey: 2000
 		Bluish_Green_Jewel: 1000
 		Glass_Bead: 1500
@@ -4399,7 +4399,7 @@ mob_db: (
 		Snowy_Horn: 200
 		Unripe_Apple: 50
 		Scarlet_Jewel: 1000
-		Angel's_Safeguard: 1000
+		Angels_Safeguard: 1000
 		Apple: 8000
 		Apple: 8000
 		Apple_Juice: 4000
@@ -4508,7 +4508,7 @@ mob_db: (
 		Claw_Of_Wolves: 8000
 		Golden_Jewel: 1500
 		Star_Dust_Blade: 100
-		Angel's_Warmth: 1000
+		Angels_Warmth: 1000
 		Red_Jewel: 10
 		Monster_Juice: 50
 		Vagabond_Wolf_Card: 1
@@ -4564,7 +4564,7 @@ mob_db: (
 		Glass_Bead: 1500
 		Four_Leaf_Clover: 30
 		Rainbow_Carrot: 50
-		Angel's_Protection: 1000
+		Angels_Protection: 1000
 		Eclipse_Card: 1
 	}
 },
@@ -4607,7 +4607,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Crystal_Blue: 50
-		Snail's_Shell: 9000
+		Snails_Shell: 9000
 		Garlet: 1200
 		Shell: 3000
 		Solid_Shell: 2
@@ -5060,7 +5060,7 @@ mob_db: (
 	Drops: {
 		Porcupine_Spike: 9000
 		Coat_: 5
-		Animal's_Skin: 5500
+		Animals_Skin: 5500
 		Glaive_: 10
 		Spear_: 15
 		Pike_: 20
@@ -5107,7 +5107,7 @@ mob_db: (
 		Acorn: 9000
 		Hood_: 20
 		Fluff: 3000
-		Animal's_Skin: 2500
+		Animals_Skin: 2500
 		Sweet_Potato: 500
 		Sandals_: 25
 		Strawberry: 600
@@ -5254,8 +5254,8 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Phracon: 85
-		Animal's_Skin: 5500
-		Adventurere's_Suit_: 80
+		Animals_Skin: 5500
+		Adventureres_Suit_: 80
 		Meat: 600
 		Cotton_Shirt: 200
 		Asura_: 5
@@ -5657,7 +5657,7 @@ mob_db: (
 	DamageMotion: 432
 	MvpExp: 12512
 	MvpDrops: {
-		Tiger's_Skin: 5000
+		Tigers_Skin: 5000
 		Tiger_Footskin: 1000
 		Flame_Heart: 3000
 	}
@@ -5961,7 +5961,7 @@ mob_db: (
 	Drops: {
 		Great_Nature: 30
 		Coal: 150
-		Elder_Pixie's_Beard: 5500
+		Elder_Pixies_Beard: 5500
 		Elven_Ears: 1
 		Cap_: 10
 		Sparkling_Dust: 100
@@ -7189,9 +7189,9 @@ mob_db: (
 	DamageMotion: 360
 	MvpExp: 0
 	Drops: {
-		Matyr's_Flea_Guard: 10
-		Monster's_Feed: 5000
-		Animal's_Skin: 5500
+		Matyrs_Flea_Guard: 10
+		Monsters_Feed: 5000
+		Animals_Skin: 5500
 		Pet_Food: 400
 		Elunium_Stone: 100
 		Grape: 200
@@ -7247,11 +7247,11 @@ mob_db: (
 		Old_Violet_Box: 2000
 	}
 	Drops: {
-		Queen's_Hair_Ornament: 500
+		Queens_Hair_Ornament: 500
 		Safety_Ring: 200
 		Tiara: 200
 		Armlet_Of_Obedience: 500
-		Mother's_Nightmare: 10
+		Mothers_Nightmare: 10
 		Elunium: 3500
 		Dea_Staff: 100
 		Maya_Card: 1
@@ -7765,7 +7765,7 @@ mob_db: (
 	}
 	Drops: {
 		Broken_Pharaoh_Symbol: 5820
-		Tutankhamen's_Mask: 2500
+		Tutankhamens_Mask: 2500
 		Solar_Sword: 100
 		Holy_Robe: 150
 		Gemmed_Crown: 500
@@ -7869,7 +7869,7 @@ mob_db: (
 		Star_Crumb: 4000
 	}
 	Drops: {
-		Thin_N'_Long_Tongue: 9700
+		Thin_N_Long_Tongue: 9700
 		Forturn_Sword: 500
 		Sucsamad: 150
 		Jaws_Of_Ant: 5000
@@ -8171,7 +8171,7 @@ mob_db: (
 		Fine_Sand: 350
 		Sparkling_Dust: 200
 		Katar_Of_Thornbush: 1
-		Hypnotist's_Staff_: 5
+		Hypnotists_Staff_: 5
 		Sand_Man_Card: 1
 	}
 },
@@ -8212,7 +8212,7 @@ mob_db: (
 	DamageMotion: 384
 	MvpExp: 0
 	Drops: {
-		Wild_Boar's_Mane: 9000
+		Wild_Boars_Mane: 9000
 		Grape: 300
 		Animal_Blood: 2
 		Eagle_Eyes: 1
@@ -8258,7 +8258,7 @@ mob_db: (
 	DamageMotion: 576
 	MvpExp: 0
 	Drops: {
-		Animal's_Skin: 9000
+		Animals_Skin: 9000
 		Axe_: 100
 		Meat: 500
 		Arrow: 1000
@@ -8310,7 +8310,7 @@ mob_db: (
 		Flame_Heart: 45
 		Tweezer: 4850
 		Hammer_Of_Blacksmith: 15
-		Scorpion's_Tail: 5000
+		Scorpions_Tail: 5000
 		Solid_Shell: 3000
 		White_Herb: 700
 		Scorpion_King_Card: 1
@@ -8647,9 +8647,9 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Rat_Tail: 9000
-		Animal's_Skin: 3000
+		Animals_Skin: 3000
 		Feather: 800
-		Monster's_Feed: 1000
+		Monsters_Feed: 1000
 		Ora_Ora: 2
 		Tarou_Card: 1
 	}
@@ -9859,12 +9859,12 @@ mob_db: (
 	DamageMotion: 768
 	MvpExp: 0
 	Drops: {
-		Executioner's_Mitten: 5
+		Executioners_Mitten: 5
 		White_Herb: 1800
 		Rose_Quartz: 1500
 		Tights_: 8
 		Earring_: 1
-		Queen's_Whip: 100
+		Queens_Whip: 100
 		Masquerade: 3
 		Zherlthsh_Card: 1
 	}
@@ -9910,8 +9910,8 @@ mob_db: (
 	DamageMotion: 540
 	MvpExp: 0
 	Drops: {
-		Thin_N'_Long_Tongue: 3880
-		Executioner's_Mitten: 3
+		Thin_N_Long_Tongue: 3880
+		Executioners_Mitten: 3
 		White_Herb: 1800
 		Crystal_Jewel_: 30
 		Frozen_Heart: 10
@@ -9960,8 +9960,8 @@ mob_db: (
 	DamageMotion: 600
 	MvpExp: 0
 	Drops: {
-		Thin_N'_Long_Tongue: 3880
-		Executioner's_Mitten: 4
+		Thin_N_Long_Tongue: 3880
+		Executioners_Mitten: 4
 		White_Herb: 1800
 		Oridecon: 150
 		Electric_Wire: 100
@@ -10012,7 +10012,7 @@ mob_db: (
 	DamageMotion: 240
 	MvpExp: 0
 	Drops: {
-		Loki's_Whispers: 1
+		Lokis_Whispers: 1
 		Biotite: 1500
 		Slayer_: 70
 		Bastard_Sword_: 40
@@ -10330,7 +10330,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Claw_Of_Rat: 4656
-		Monster's_Feed: 1000
+		Monsters_Feed: 1000
 		Blue_Jewel: 80
 		Glass_Bead: 110
 		Lemon: 250
@@ -10840,7 +10840,7 @@ mob_db: (
 	DamageMotion: 384
 	MvpExp: 0
 	Drops: {
-		Wild_Boar's_Mane: 6000
+		Wild_Boars_Mane: 6000
 		Grape: 150
 		Animal_Blood: 3
 		Eagle_Eyes: 2
@@ -11476,7 +11476,7 @@ mob_db: (
 		Yoyo_Tail: 6000
 		Cacao: 500
 		Yellow_Herb: 130
-		Animal's_Skin: 5500
+		Animals_Skin: 5500
 		Monkey_Doll: 7
 		Strawberry: 500
 		Orange: 1000
@@ -11906,7 +11906,7 @@ mob_db: (
 		White_Herb: 800
 		Feather: 1000
 		Panda_Cap: 1
-		Bear's_Foot: 5000
+		Bears_Foot: 5000
 		White_Jewel: 30
 		Elunium_Stone: 90
 		Sasquatch_Card: 1
@@ -12000,7 +12000,7 @@ mob_db: (
 		Gift_Box: 10
 		Dirk_: 10
 		Buckler_: 5
-		Santa's_Hat: 10
+		Santas_Hat: 10
 		Goblin_Card: 1
 	}
 },
@@ -12094,7 +12094,7 @@ mob_db: (
 		Piece_Of_Cake: 1000
 		Candy: 5500
 		Candy_Striper: 5500
-		Santa's_Hat: 250
+		Santas_Hat: 250
 		Antonio_Card: 1
 	}
 },
@@ -12814,8 +12814,8 @@ mob_db: (
 		Fruit_Shell: 120
 		Arrow_Of_Shadow: 3000
 		Rotten_Fish: 35
-		Monster's_Feed: 600
-		Big_Sis'_Ribbon: 2
+		Monsters_Feed: 600
+		Big_Sis_Ribbon: 2
 		Wild_Rose_Card: 1
 	}
 },
@@ -13508,7 +13508,7 @@ mob_db: (
 	DamageMotion: 480
 	MvpExp: 0
 	Drops: {
-		Alice's_Apron: 2500
+		Alices_Apron: 2500
 		Old_Broom: 40
 		Chrystal_Pumps: 3
 		Rouge: 30
@@ -14166,7 +14166,7 @@ mob_db: (
 		Oridecon_Stone: 300
 		Gold: 100
 		Oridecon: 150
-		Queen's_Hair_Ornament: 1
+		Queens_Hair_Ornament: 1
 		Cookbook10: 2
 		Maya_Puple_Card: 1
 	}
@@ -15057,7 +15057,7 @@ mob_db: (
 	DamageMotion: 192
 	MvpExp: 0
 	Drops: {
-		Bear's_Foot: 4550
+		Bears_Foot: 4550
 		Poo_Poo_Hat: 8
 		Stuffed_Doll: 120
 		Honey: 500
@@ -15319,7 +15319,7 @@ mob_db: (
 	DamageMotion: 384
 	MvpExp: 0
 	Drops: {
-		Wild_Boar's_Mane: 3500
+		Wild_Boars_Mane: 3500
 		Grape: 290
 		Animal_Blood: 6
 		Eagle_Eyes: 1
@@ -18110,7 +18110,7 @@ mob_db: (
 	Drops: {
 		Fruit_Of_Mastela: 1500
 		Chrystal_Pumps: 3
-		Boy's_Naivety: 1
+		Boys_Naivety: 1
 		Diamond_Ring: 250
 		Horn_Of_Succubus: 1
 		Staff_Of_Soul: 1
@@ -18205,8 +18205,8 @@ mob_db: (
 	DamageMotion: 336
 	MvpExp: 0
 	Drops: {
-		Goat's_Horn: 4559
-		Gaoat's_Skin: 2500
+		Goats_Horn: 4559
+		Gaoats_Skin: 2500
 		Empty_Bottle: 5000
 		Red_Herb: 500
 		Blue_Herb: 1000
@@ -18417,8 +18417,8 @@ mob_db: (
 	DamageMotion: 470
 	MvpExp: 0
 	Drops: {
-		Harpy's_Feather: 4850
-		Harpy's_Claw: 2500
+		Harpys_Feather: 4850
+		Harpys_Claw: 2500
 		Yellow_Herb: 1500
 		Yellow_Herb: 800
 		Izidor: 20
@@ -18661,8 +18661,8 @@ mob_db: (
 	DamageMotion: 192
 	MvpExp: 0
 	Drops: {
-		Bear's_Foot: 5000
-		Animal's_Skin: 5000
+		Bears_Foot: 5000
+		Animals_Skin: 5000
 		Nice_Sweet_Potato: 2500
 		Grizzly_Card: 1
 	}
@@ -18804,7 +18804,7 @@ mob_db: (
 	DamageMotion: 384
 	MvpExp: 0
 	Drops: {
-		Dragon's_Skin: 4074
+		Dragons_Skin: 4074
 		Dragon_Canine: 5335
 		Dragon_Train: 3880
 		Dragon_Scale: 3589
@@ -18851,7 +18851,7 @@ mob_db: (
 	DamageMotion: 336
 	MvpExp: 0
 	Drops: {
-		Dragon's_Skin: 4074
+		Dragons_Skin: 4074
 		Dragon_Canine: 5335
 		Dragon_Train: 3880
 		Dragon_Scale: 3589
@@ -18903,7 +18903,7 @@ mob_db: (
 		Great_Nature: 2500
 		Oridecon_Stone: 300
 		Damascus_: 5
-		Hypnotist's_Staff_: 5
+		Hypnotists_Staff_: 5
 		Fine_Sand: 1200
 		Sleeper_Card: 1
 	}
@@ -18948,8 +18948,8 @@ mob_db: (
 	DamageMotion: 576
 	MvpExp: 0
 	Drops: {
-		Scropion's_Nipper: 4365
-		Scorpion's_Tail: 5500
+		Scropions_Nipper: 4365
+		Scorpions_Tail: 5500
 		Red_Gemstone: 150
 		Panacea: 2500
 		Flame_Heart: 850
@@ -19636,7 +19636,7 @@ mob_db: (
 		Broken_Shuriken: 5335
 		Ninja_Suit: 2
 		Cyfar: 2200
-		Shinobi's_Sash: 100
+		Shinobis_Sash: 100
 		Thief_Clothes_: 1
 		Black_Mask: 2000
 		Murasame_: 5
@@ -19680,7 +19680,7 @@ mob_db: (
 	DamageMotion: 864
 	MvpExp: 0
 	Drops: {
-		Poison_Toad's_Skin: 5500
+		Poison_Toads_Skin: 5500
 		Poison_Powder: 2400
 		Gold_Ring: 4
 		Green_Herb: 540
@@ -19829,7 +19829,7 @@ mob_db: (
 	DamageMotion: 672
 	MvpExp: 0
 	Drops: {
-		Tengu's_Nose: 3500
+		Tengus_Nose: 3500
 		Broken_Wine_Vessel: 5500
 		Huuma_Giant_Wheel: 5
 		Fruit_Of_Mastela: 150
@@ -20366,7 +20366,7 @@ mob_db: (
 	DamageMotion: 420
 	MvpExp: 0
 	Drops: {
-		Black_Bear's_Skin: 4462
+		Black_Bears_Skin: 4462
 		Mystery_Iron_Bit: 3500
 		Royal_Jelly: 400
 		Honey: 900
@@ -24004,7 +24004,7 @@ mob_db: (
 	DamageMotion: 480
 	MvpExp: 0
 	Drops: {
-		Dullahan's_Helm: 3200
+		Dullahans_Helm: 3200
 		Dullahan_Armor: 4850
 		An_Eye_Of_Dullahan: 1
 		Manteau: 13
@@ -24057,7 +24057,7 @@ mob_db: (
 		Striped_Socks: 3000
 		Bat_Cage: 5044
 		Elunium: 100
-		Loki's_Whispers: 1
+		Lokis_Whispers: 1
 		Lunatic_Brooch: 5
 		Loli_Ruri_Card: 1
 	}
@@ -24158,7 +24158,7 @@ mob_db: (
 		Rusty_Cleaver: 2000
 		Mr_Scream: 50
 		Oridecon: 100
-		Mama's_Knife: 3
+		Mamas_Knife: 3
 		Ginnungagap: 1
 		Bloody_Murderer_Card: 1
 	}
@@ -29421,7 +29421,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Meat: 1000
-		Monster's_Feed: 1000
+		Monsters_Feed: 1000
 		Hill_Wind_Card: 1
 	}
 },
@@ -29928,7 +29928,7 @@ mob_db: (
 	Drops: {
 		Armlet_Of_Prisoner: 3000
 		Old_Blue_Box: 50
-		La'cryma_Stick: 1
+		Lacryma_Stick: 1
 		Survival_Rod2_: 5
 		Guard_: 30
 		Pair_Of_Red_Ribbon: 1
@@ -30277,7 +30277,7 @@ mob_db: (
 		Full_Plate_Armor_: 3500
 		Grave_: 9000
 		Brionac: 3500
-		Longinus's_Spear: 3000
+		Longinuss_Spear: 3000
 		Dragon_Slayer: 2500
 		Skewer: 1500
 		B_Seyren_Card: 1
@@ -30677,7 +30677,7 @@ mob_db: (
 	Drops: {
 		Armlet_Of_Prisoner: 2000
 		Forturn_Sword: 1
-		Adventurere's_Suit_: 40
+		Adventureres_Suit_: 40
 		Gladius_: 10
 		Chain_Mail_: 2
 		Ring_Of_Rogue: 2
@@ -31955,9 +31955,9 @@ mob_db: (
 	DamageMotion: 360
 	MvpExp: 0
 	Drops: {
-		Harpy's_Feather: 4000
-		Harpy's_Claw: 3000
-		Monster's_Feed: 1000
+		Harpys_Feather: 4000
+		Harpys_Claw: 3000
+		Monsters_Feed: 1000
 		Blue_Herb: 10
 		Hill_Wind_Card: 1
 	}
@@ -32295,7 +32295,7 @@ mob_db: (
 		Reptile_Tongue: 1000
 		Leaflet_Of_Hinal: 1000
 		Green_Herb: 1000
-		Monster's_Feed: 2000
+		Monsters_Feed: 2000
 		Aloebera: 10
 		Green_Herb: 1
 		Green_Iguana_Card: 1
@@ -32831,7 +32831,7 @@ mob_db: (
 		Bookclip_In_Memory: 300
 		Legend_Of_Kafra01: 50
 		Bloody_Page: 500
-		Vidar's_Boots: 10
+		Vidars_Boots: 10
 		Cookbook08: 2
 		Cookbook09: 1
 		Deathword_Card: 1
@@ -33152,7 +33152,7 @@ mob_db: (
 		Crystal_Jewel__: 100
 		Piece_Of_Memory_Blue: 10000
 		Old_Card_Album: 10
-		Goibne's_Shoulder_Arms: 1000
+		Goibnes_Shoulder_Arms: 1000
 		Tha_Odium_Card: 1
 	}
 },
@@ -33206,7 +33206,7 @@ mob_db: (
 		Crystal_Jewel__: 100
 		Piece_Of_Memory_Red: 10000
 		Old_Card_Album: 10
-		Goibne's_Combat_Boots: 1000
+		Goibnes_Combat_Boots: 1000
 		Tha_Despero_Card: 1
 	}
 },
@@ -33260,7 +33260,7 @@ mob_db: (
 		Crystal_Jewel__: 100
 		Piece_Of_Memory_Purple: 10000
 		Old_Card_Album: 10
-		Goibne's_Armor: 1000
+		Goibnes_Armor: 1000
 		Tha_Maero_Card: 1
 	}
 },
@@ -33314,7 +33314,7 @@ mob_db: (
 		Crystal_Jewel__: 100
 		Piece_Of_Memory_Green: 10000
 		Old_Card_Album: 10
-		Goibne's_Helmet: 1000
+		Goibnes_Helmet: 1000
 		Tha_Dolor_Card: 1
 	}
 },
@@ -33369,7 +33369,7 @@ mob_db: (
 	}
 	Drops: {
 		Treasure_Box: 1000
-		Morrigane's_Manteau: 1000
+		Morriganes_Manteau: 1000
 		Piece_Of_Bone_Armor: 5000
 		Full_Plate_Armor_: 5000
 		Grave_: 5000
@@ -33666,7 +33666,7 @@ mob_db: (
 	Drops: {
 		Strawberry: 2200
 		Dragon_Canine: 1000
-		Dragon's_Skin: 1000
+		Dragons_Skin: 1000
 		Dragon_Scale: 2000
 		Dragonball_Red: 800
 		Flame_Heart: 20
@@ -33915,8 +33915,8 @@ mob_db: (
 		Crystal_Jewel__: 2000
 	}
 	Drops: {
-		Morpheus's_Armlet: 1000
-		Morpheus's_Ring: 1000
+		Morpheuss_Armlet: 1000
+		Morpheuss_Ring: 1000
 		Treasure_Box: 5000
 		Scale_Of_Red_Dragon: 3589
 		Int_Dish10: 1000
@@ -33970,11 +33970,11 @@ mob_db: (
 	DamageMotion: 432
 	MvpExp: 0
 	Drops: {
-		Dragon's_Skin: 4000
+		Dragons_Skin: 4000
 		Dragon_Canine: 4000
 		Tri_Headed_Dragon_Head: 3880
-		Morpheus's_Hood: 500
-		Morrigane's_Helm: 500
+		Morpheuss_Hood: 500
+		Morriganes_Helm: 500
 		Vit_Dish10: 300
 		Fricca_Circlet: 500
 		Hydro_Card: 1
@@ -34553,11 +34553,11 @@ mob_db: (
 	Drops: {
 		Pocket_Watch: 3000
 		Old_Violet_Box: 3000
-		Morrigane's_Pendant: 1000
+		Morriganes_Pendant: 1000
 		Glittering_Clothes: 1000
 		Survival_Rod_: 500
 		Counter_Dagger: 500
-		Morrigane's_Belt: 1000
+		Morriganes_Belt: 1000
 		Kiel_Card: 1
 	}
 },
@@ -34608,7 +34608,7 @@ mob_db: (
 		Screw: 500
 		Drill_Katar: 5
 		Elunium: 10
-		Vali's_Manteau: 20
+		Valis_Manteau: 20
 		Alicel_Card: 1
 	}
 },
@@ -34701,9 +34701,9 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Brigan: 4000
-		Morpheus's_Shawl: 10
+		Morpheuss_Shawl: 10
 		Rosary_: 10
-		Alice's_Apron: 5
+		Alices_Apron: 5
 		Imperial_Cooking_Kits: 50
 		Sway_Apron: 1
 		Orleans_Server: 5
@@ -35460,7 +35460,7 @@ mob_db: (
 		Divine_Cross: 25
 		Rune_Of_Darkness: 1000
 		Silk_Robe_: 100
-		Odin's_Blessing: 100
+		Odins_Blessing: 100
 		Skeggiold_Card: 1
 	}
 },
@@ -35514,7 +35514,7 @@ mob_db: (
 		Divine_Cross: 25
 		Rune_Of_Darkness: 1000
 		Silk_Robe_: 100
-		Odin's_Blessing: 100
+		Odins_Blessing: 100
 		Skeggiold_Card: 1
 	}
 },
@@ -35945,7 +35945,7 @@ mob_db: (
 	Drops: {
 		Valhalla_Flower: 500
 		Old_Violet_Box: 100
-		Valkyrja's_Shield: 500
+		Valkyrjas_Shield: 500
 	}
 },
 {
@@ -36777,7 +36777,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Rotten_Meat: 3000
-		Animal's_Skin: 3000
+		Animals_Skin: 3000
 		Wind_Of_Verdure: 50
 		Combo_Battle_Glove: 2
 		Roween_Card: 1
@@ -36825,7 +36825,7 @@ mob_db: (
 	MvpExp: 0
 	Drops: {
 		Rotten_Meat: 3000
-		Animal's_Skin: 3000
+		Animals_Skin: 3000
 		Rough_Wind: 10
 		Ulfhedinn: 5
 		Galion_Card: 1
@@ -39390,7 +39390,7 @@ mob_db: (
 	Drops: {
 		Great_Nature: 30
 		Coal: 150
-		Elder_Pixie's_Beard: 5500
+		Elder_Pixies_Beard: 5500
 		Elven_Ears: 1
 		Ribbon: 10
 		Thorny_Buckler: 3
@@ -40391,7 +40391,7 @@ mob_db: (
 		Acorn: 9000
 		Hood_: 20
 		Fluff: 3000
-		Animal's_Skin: 2500
+		Animals_Skin: 2500
 		Sweet_Potato: 500
 		Sandals_: 25
 		Sweet_Bean: 600
@@ -40682,12 +40682,12 @@ mob_db: (
 	DamageMotion: 360
 	MvpExp: 0
 	Drops: {
-		Monster's_Feed: 5000
+		Monsters_Feed: 5000
 		Tooth_Blade: 10
 		Wild_Beast_Claw: 10
 		Skel_Bone: 4500
 		Well_Dried_Bone: 20
-		Animal's_Skin: 5500
+		Animals_Skin: 5500
 		Pet_Food: 400
 		Hell_Poodle_Card: 1
 	}
@@ -47081,7 +47081,7 @@ mob_db: (
 	DamageMotion: 336
 	MvpExp: 0
 	Drops: {
-		Cowking's_Nose_Ring: 10000
+		Cowkings_Nose_Ring: 10000
 	}
 },
 {
@@ -47231,8 +47231,8 @@ mob_db: (
 	DamageMotion: 504
 	MvpExp: 0
 	Drops: {
-		Dragon's_Mane: 3000
-		Dragon's_Skin: 100
+		Dragons_Mane: 3000
+		Dragons_Skin: 100
 		Dragon_Canine: 100
 		Dragon_Train: 1000
 		Dragon_Scale: 1000
@@ -48022,7 +48022,7 @@ mob_db: (
 	DamageMotion: 360
 	MvpExp: 0
 	Drops: {
-		Pope's_Cookie: 5000
+		Popes_Cookie: 5000
 	}
 },
 {
@@ -48070,7 +48070,7 @@ mob_db: (
 	DamageMotion: 384
 	MvpExp: 0
 	Drops: {
-		Pope's_Cookie: 5000
+		Popes_Cookie: 5000
 	}
 },
 /*{
@@ -49561,7 +49561,7 @@ mob_db: (
 		Tooth_Of_Ancient_Fish: 500
 		Lip_Of_Ancient_Fish: 500
 		Mistic_Frozen: 5
-		Fisherman's_Dagger: 5
+		Fishermans_Dagger: 5
 		Scalpel: 1
 	}
 },
@@ -49657,7 +49657,7 @@ mob_db: (
 	Drops: {
 		Leopard_Skin: 3000
 		Leopard_Talon: 2000
-		Animal's_Skin: 1000
+		Animals_Skin: 1000
 		Oridecon_Stone: 40
 		Claw_: 1
 	}
diff --git a/db/pre-re/mob_race2_db.txt b/db/pre-re/mob_race2_db.txt
index 05f5e421a..410301699 100644
--- a/db/pre-re/mob_race2_db.txt
+++ b/db/pre-re/mob_race2_db.txt
@@ -13,5 +13,5 @@
 4,1040,1278,1366,1497,2024
 // Guardians
 5,1285,1286,1287
-// Ninja Classes (Pirate's_Pride)
+// Ninja Classes (Pirates_Pride)
 6,1315,1364,1401,1560
diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf
index 9a9b64038..95683a9e0 100644
--- a/db/pre-re/skill_db.conf
+++ b/db/pre-re/skill_db.conf
@@ -21328,7 +21328,7 @@ skill_db: (
 	Requirements: {
 		SPCost: 5
 		Items: {
-			Wolf's_Flute: 0
+			Wolfs_Flute: 0
 		}
 	}
 },
@@ -37240,4 +37240,4 @@ skill_db: (
 	}
 	NumberOfHits: 0
 },
-)
\ No newline at end of file
+)