diff --git a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json
similarity index 94%
rename from kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json
rename to kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json
index e57137623..8e75cf209 100644
--- a/kubejs/data/endermanoverhaul/loot_tables/entities/cave_enderman.json
+++ b/kubejs/data/endermanoverhaul/loot_tables/entities/nether_wastes_enderman.json
@@ -67,5 +67,5 @@
 			"rolls": 1.0
 		}
 	],
-	"random_sequence": "endermanoverhaul:entities/cave_enderman"
+	"random_sequence": "endermanoverhaul:entities/nether_wastes_enderman"
 }
\ No newline at end of file
diff --git a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json
index fa9968461..c81f371e0 100644
--- a/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json
+++ b/kubejs/data/tfg/worldgen/biome/nether/diorite_caves.json
@@ -168,7 +168,7 @@
 				"weight": 10
 			},
 			{
-				"type": "endermanoverhaul:cave_enderman",
+				"type": "endermanoverhaul:nether_wastes_enderman",
 				"maxCount": 1,
 				"minCount": 1,
 				"weight": 5
diff --git a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json
index 30f203713..dbd3d9c92 100644
--- a/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json
+++ b/kubejs/data/tfg/worldgen/biome/nether/gabbro_caves.json
@@ -168,7 +168,7 @@
 				"weight": 10
 			},
 			{
-				"type": "endermanoverhaul:cave_enderman",
+				"type": "endermanoverhaul:nether_wastes_enderman",
 				"maxCount": 1,
 				"minCount": 1,
 				"weight": 5
diff --git a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json
index 47be21839..037f3abe5 100644
--- a/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json
+++ b/kubejs/data/tfg/worldgen/biome/nether/gneiss_caves.json
@@ -169,7 +169,7 @@
 				"weight": 10
 			},
 			{
-				"type": "endermanoverhaul:cave_enderman",
+				"type": "endermanoverhaul:nether_wastes_enderman",
 				"maxCount": 1,
 				"minCount": 1,
 				"weight": 5
diff --git a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json
index 6b81b7ff9..ab5dc1fb6 100644
--- a/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json
+++ b/kubejs/data/tfg/worldgen/biome/nether/granite_caves.json
@@ -169,7 +169,7 @@
 				"weight": 10
 			},
 			{
-				"type": "endermanoverhaul:cave_enderman",
+				"type": "endermanoverhaul:nether_wastes_enderman",
 				"maxCount": 1,
 				"minCount": 1,
 				"weight": 5
diff --git a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json
index f53265473..8c88bae78 100644
--- a/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json
+++ b/kubejs/data/tfg/worldgen/biome/nether/schist_caves.json
@@ -168,7 +168,7 @@
 				"weight": 10
 			},
 			{
-				"type": "endermanoverhaul:cave_enderman",
+				"type": "endermanoverhaul:nether_wastes_enderman",
 				"maxCount": 1,
 				"minCount": 1,
 				"weight": 5
diff --git a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json
index 37aa936d5..eaad477e0 100644
--- a/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json
+++ b/kubejs/data/tfg/worldgen/biome/nether/webbed_lair.json
@@ -155,7 +155,7 @@
 				"weight": 75
 			},
 			{
-				"type": "endermanoverhaul:cave_enderman",
+				"type": "endermanoverhaul:nether_wastes_enderman",
 				"maxCount": 1,
 				"minCount": 1,
 				"weight": 75