diff --git a/worlds/hk/Items.py b/worlds/hk/Items.py
index a9acbf48f303..def5c3298102 100644
--- a/worlds/hk/Items.py
+++ b/worlds/hk/Items.py
@@ -19,18 +19,43 @@ class HKItemData(NamedTuple):
 for item, item_data in item_table.items():
     lookup_type_to_names.setdefault(item_data.type, set()).add(item)
 
-item_name_groups = {group: lookup_type_to_names[group] for group in ("Skill", "Charm", "Mask", "Vessel",
-                                                                     "Relic", "Root", "Map", "Stag", "Cocoon",
-                                                                     "Soul", "DreamWarrior", "DreamBoss")}
-
 directionals = ('', 'Left_', 'Right_')
-
-item_name_groups.update({
+item_name_groups = ({
+    "BossEssence": lookup_type_to_names["DreamWarrior"] | lookup_type_to_names["DreamBoss"],
+    "BossGeo": lookup_type_to_names["Boss_Geo"],
+    "CDash": {x + "Crystal_Heart" for x in directionals},
+    "Charms": lookup_type_to_names["Charm"],
+    "CharmNotches": lookup_type_to_names["Notch"],
+    "Claw": {x + "Mantis_Claw" for x in directionals},
+    "Cloak": {x + "Mothwing_Cloak" for x in directionals} | {"Shade_Cloak", "Split_Shade_Cloak"},
+    "Dive": {"Desolate_Dive", "Descending_Dark"},
+    "LifebloodCocoons": lookup_type_to_names["Cocoon"],
     "Dreamers": {"Herrah", "Monomon", "Lurien"},
-    "Cloak": {x + 'Mothwing_Cloak' for x in directionals} | {'Shade_Cloak', 'Split_Shade_Cloak'},
-    "Claw": {x + 'Mantis_Claw' for x in directionals},
-    "CDash": {x + 'Crystal_Heart' for x in directionals},
-    "Fragments": {"Queen_Fragment", "King_Fragment", "Void_Heart"},
+    "Fireball": {"Vengeful_Spirit", "Shade_Soul"},
+    "GeoChests": lookup_type_to_names["Geo"],
+    "GeoRocks": lookup_type_to_names["Rock"],
+    "GrimmkinFlames": lookup_type_to_names["Flame"],
+    "Grubs": lookup_type_to_names["Grub"],
+    "JournalEntries": lookup_type_to_names["Journal"],
+    "JunkPitChests": lookup_type_to_names["JunkPitChest"],
+    "Keys": lookup_type_to_names["Key"],
+    "LoreTablets": lookup_type_to_names["Lore"] | lookup_type_to_names["PalaceLore"],
+    "Maps": lookup_type_to_names["Map"],
+    "MaskShards": lookup_type_to_names["Mask"],
+    "Mimics": lookup_type_to_names["Mimic"],
+    "Nail": lookup_type_to_names["CursedNail"],
+    "PalaceJournal": {"Journal_Entry-Seal_of_Binding"},
+    "PalaceLore": lookup_type_to_names["PalaceLore"],
+    "PalaceTotem": {"Soul_Totem-Palace", "Soul_Totem-Path_of_Pain"},
+    "RancidEggs": lookup_type_to_names["Egg"],
+    "Relics": lookup_type_to_names["Relic"],
+    "Scream": {"Howling_Wraiths", "Abyss_Shriek"},
+    "Skills": lookup_type_to_names["Skill"],
+    "SoulTotems": lookup_type_to_names["Soul"],
+    "Stags": lookup_type_to_names["Stag"],
+    "VesselFragments": lookup_type_to_names["Vessel"],
+    "WhisperingRoots": lookup_type_to_names["Root"],
+    "WhiteFragments": {"Queen_Fragment", "King_Fragment", "Void_Heart"},
 })
 item_name_groups['Horizontal'] = item_name_groups['Cloak'] | item_name_groups['CDash']
 item_name_groups['Vertical'] = item_name_groups['Claw'] | {'Monarch_Wings'}