diff --git a/tools/namefixer.py b/tools/namefixer.py
index c09562bb74..859ee14899 100755
--- a/tools/namefixer.py
+++ b/tools/namefixer.py
@@ -17,7 +17,7 @@ simpleReplace = {
     "ENTR_MIZUSIN_BS": "ENTR_WATER_TEMPLE_BOSS",
     "ENTR_JYASINBOSS": "ENTR_SPIRIT_TEMPLE_BOSS",
     "ENTR_HAKADAN_BS": "ENTR_SHADOW_TEMPLE_BOSS",
-    "ENTR_GANON_BOSS": "ENTR_GANONDORF_BOSS",
+    #"ENTR_GANON_BOSS": "ENTR_GANONDORF_BOSS", # ENTR_GANON_BOSS is also in the new names
     "ENTR_YDAN": "ENTR_DEKU_TREE",
     "ENTR_DDAN": "ENTR_DODONGOS_CAVERN",
     "ENTR_BDAN": "ENTR_JABU_JABU",
@@ -40,9 +40,6 @@ simpleReplace = {
     "ENTR_ENRUI": "ENTR_MARKET_ENTRANCE_RUINS",
     "ENTR_MARKET_ALLEY_N": "ENTR_BACK_ALLEY_NIGHT",
     "ENTR_MARKET_ALLEY": "ENTR_BACK_ALLEY_DAY",
-    "ENTR_MARKET_DAY": "ENTR_MARKET_DAY",
-    "ENTR_MARKET_NIGHT": "ENTR_MARKET_NIGHT",
-    "ENTR_MARKET_RUINS": "ENTR_MARKET_RUINS",
     "ENTR_SHRINE_N": "ENTR_TEMPLE_OF_TIME_EXTERIOR_NIGHT",
     "ENTR_SHRINE_R": "ENTR_TEMPLE_OF_TIME_EXTERIOR_RUINS",
     "ENTR_SHRINE": "ENTR_TEMPLE_OF_TIME_EXTERIOR_DAY",
@@ -51,9 +48,7 @@ simpleReplace = {
     "ENTR_KOKIRI_HOME5": "ENTR_SARIAS_HOUSE",
     "ENTR_KOKIRI_HOME": "ENTR_KNOW_IT_ALL_BROS_HOUSE",
     "ENTR_KAKARIKO3": "ENTR_BACK_ALLEY_HOUSE",
-    "ENTR_KAKARIKO": "ENTR_KAKARIKO_CENTER_GUEST_HOUSE",
     "ENTR_SHOP1": "ENTR_BAZAAR",
-    "ENTR_KOKIRI_SHOP": "ENTR_KOKIRI_SHOP",
     "ENTR_GOLON": "ENTR_GORON_SHOP",
     "ENTR_ZOORA": "ENTR_ZORA_SHOP",
     "ENTR_DRAG": "ENTR_POTION_SHOP_KAKARIKO",
@@ -61,7 +56,6 @@ simpleReplace = {
     "ENTR_NIGHT_SHOP": "ENTR_BOMBCHU_SHOP",
     "ENTR_FACE_SHOP": "ENTR_HAPPY_MASK_SHOP",
     "ENTR_LINK_HOME": "ENTR_LINKS_HOUSE",
-    "ENTR_IMPA": "ENTR_DOG_LADY_HOUSE",
     "ENTR_MALON_STABLE": "ENTR_STABLE",
     "ENTR_LABO": "ENTR_IMPAS_HOUSE",
     "ENTR_HYLIA_LABO": "ENTR_LAKESIDE_LABORATORY",
@@ -112,6 +106,8 @@ simpleReplace = {
     "ENTR_GANON_0": "ENTR_GANONS_TOWER_0",
     "ENTR_GANON_1": "ENTR_GANONS_TOWER_1",
     "ENTR_GANON_2": "ENTR_GANONS_TOWER_2",
+    "ENTR_KAKARIKO_0": "ENTR_KAKARIKO_CENTER_GUEST_HOUSE_0",
+    "ENTR_IMPA_0": "ENTR_DOG_LADY_HOUSE_0",
 }
 
 # all occurrences of keys will be replaced by associated value,
@@ -296,16 +292,13 @@ wordReplace = {
     "SCENE_MIZUSIN_BS": "SCENE_WATER_TEMPLE_BOSS",
     "SCENE_JYASINBOSS": "SCENE_SPIRIT_TEMPLE_BOSS",
     "SCENE_HAKADAN_BS": "SCENE_SHADOW_TEMPLE_BOSS",
-    "SCENE_GANON_BOSS": "SCENE_GANONDORF_BOSS",
+    #"SCENE_GANON_BOSS": "SCENE_GANONDORF_BOSS", # SCENE_GANON_BOSS is also in the new scene enum
     "SCENE_GANON_FINAL": "SCENE_GANONS_TOWER_COLLAPSE_EXTERIOR",
     "SCENE_ENTRA": "SCENE_MARKET_ENTRANCE_DAY",
     "SCENE_ENTRA_N": "SCENE_MARKET_ENTRANCE_NIGHT",
     "SCENE_ENRUI": "SCENE_MARKET_ENTRANCE_RUINS",
     "SCENE_MARKET_ALLEY": "SCENE_BACK_ALLEY_DAY",
     "SCENE_MARKET_ALLEY_N": "SCENE_BACK_ALLEY_NIGHT",
-    "SCENE_MARKET_DAY": "SCENE_MARKET_DAY",
-    "SCENE_MARKET_NIGHT": "SCENE_MARKET_NIGHT",
-    "SCENE_MARKET_RUINS": "SCENE_MARKET_RUINS",
     "SCENE_SHRINE": "SCENE_TEMPLE_OF_TIME_EXTERIOR_DAY",
     "SCENE_SHRINE_N": "SCENE_TEMPLE_OF_TIME_EXTERIOR_NIGHT",
     "SCENE_SHRINE_R": "SCENE_TEMPLE_OF_TIME_EXTERIOR_RUINS",
@@ -316,7 +309,6 @@ wordReplace = {
     "SCENE_KAKARIKO": "SCENE_KAKARIKO_CENTER_GUEST_HOUSE",
     "SCENE_KAKARIKO3": "SCENE_BACK_ALLEY_HOUSE",
     "SCENE_SHOP1": "SCENE_BAZAAR",
-    "SCENE_KOKIRI_SHOP": "SCENE_KOKIRI_SHOP",
     "SCENE_GOLON": "SCENE_GORON_SHOP",
     "SCENE_ZOORA": "SCENE_ZORA_SHOP",
     "SCENE_DRAG": "SCENE_POTION_SHOP_KAKARIKO",