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>

1 files changed, 91 insertions, 91 deletions

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",