diff --git a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
index fe7ac2465..7946df2e2 100644
--- a/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
+++ b/common/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.21	2024-06-16T11:04:40.2831315	Registries
+// 1.21	2024-06-30T12:03:31.2157442	Registries
 bec08031dc5126119d3c7a1033703f8235bdf56e data/biomesoplenty/damage_type/bramble.json
 41f8df67f585538edc9847b6754275d24b813e06 data/biomesoplenty/damage_type/fumarole.json
 0c0c0e1d86c46fe18511530c95f33978fb71286a data/biomesoplenty/jukebox_song/wanderer.json
@@ -97,7 +97,7 @@ dd7a0cbfe1cc76293e56757a210363820e3eca76 data/biomesoplenty/worldgen/configured_
 8dc29fab085a97f7cc338ad6f532aedb5e06626f data/biomesoplenty/worldgen/configured_feature/blackstone_bulb.json
 8cd0f919bae6a6ead8b70a215626c0d8e97e1b65 data/biomesoplenty/worldgen/configured_feature/blackstone_spines.json
 4564cde04d7e88f215e3e439702e48a3682e7a52 data/biomesoplenty/worldgen/configured_feature/black_sand_splatter.json
-8cdab34a8c77793f8c77d32083db43185a96e100 data/biomesoplenty/worldgen/configured_feature/blood_lake.json
+635ca00a3975c046db08789b330862a723ba7c10 data/biomesoplenty/worldgen/configured_feature/blood_lake.json
 2d4844fff4cb2135980a58de048bf87caa0a9bee data/biomesoplenty/worldgen/configured_feature/blood_spring.json
 2b93c838ff048ba3aa64c57c9beab7b299e41789 data/biomesoplenty/worldgen/configured_feature/bone_spine.json
 8983f10fea2f2b9edbab92a2c9c0332f32fccc3c data/biomesoplenty/worldgen/configured_feature/bramble.json
@@ -190,7 +190,7 @@ ff031c362e184aeb1904ef6fba824176745b740d data/biomesoplenty/worldgen/configured_
 e9db8e528df8caed0180499c4d98b3bb784371c8 data/biomesoplenty/worldgen/configured_feature/huge_glowshroom_cave.json
 bb3fe8467bde7c9f00112da9e30d10dffd41ef73 data/biomesoplenty/worldgen/configured_feature/huge_lily_pad.json
 8c9692cfc6d323ac72683f619d933ba15142bc18 data/biomesoplenty/worldgen/configured_feature/huge_toadstool.json
-2c42a3d8d6eba28c8eeba000e599b26fd4f2d426 data/biomesoplenty/worldgen/configured_feature/inferno_lava_lake.json
+91f2984b21aa09c8705bfff4ee16400573a4ce82 data/biomesoplenty/worldgen/configured_feature/inferno_lava_lake.json
 8c2fd6848a1a5a481273745efa703e747137cd07 data/biomesoplenty/worldgen/configured_feature/inferno_lava_spring.json
 e69a390f6ad667dd5dc688a31cb6d1d1f581d27c data/biomesoplenty/worldgen/configured_feature/inferno_splatter.json
 ecff03adb86fee8662aaa264a1064333122deb83 data/biomesoplenty/worldgen/configured_feature/jacaranda_tree.json
@@ -201,7 +201,7 @@ bccd849ed1fd3f32daad2b1f705c30f834c20f96 data/biomesoplenty/worldgen/configured_
 e6c40fcb31d153fc2379756e7f97f99cd816a51f data/biomesoplenty/worldgen/configured_feature/large_fumarole.json
 dae0a1ba6f5534a72d7a71a9d38f6c9494e21bed data/biomesoplenty/worldgen/configured_feature/large_rose_quartz.json
 863215c984d1e63a8021b3117febf08233b183d4 data/biomesoplenty/worldgen/configured_feature/lava_lake_volcano.json
-bc7a09901e7f698ce8bfd34adbc13b3c22495df2 data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
+8c03f98f7cc3feb11333c15c6296a2b0cdf1285b data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
 d8bd16e51de0100b1d889553f4db0a8bd0293ebe data/biomesoplenty/worldgen/configured_feature/liquid_null_spring.json
 91b0f6d42e3f58a93e9eb9a6262e707622f66c7f data/biomesoplenty/worldgen/configured_feature/lumaloop.json
 bedf4220d0a9a4c61aaaef6c2b228da620cc38cc data/biomesoplenty/worldgen/configured_feature/magic_tree.json
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/blood_lake.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/blood_lake.json
index cfac29bd3..f76689e6d 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/blood_lake.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/blood_lake.json
@@ -1,5 +1,5 @@
 {
-  "type": "minecraft:lake",
+  "type": "biomesoplenty:lake",
   "config": {
     "barrier": {
       "type": "minecraft:simple_state_provider",
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/inferno_lava_lake.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/inferno_lava_lake.json
index ce04450ad..9ab6e14d0 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/inferno_lava_lake.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/inferno_lava_lake.json
@@ -1,5 +1,5 @@
 {
-  "type": "minecraft:lake",
+  "type": "biomesoplenty:lake",
   "config": {
     "barrier": {
       "type": "minecraft:simple_state_provider",
diff --git a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
index 971bcc86b..a491c3f66 100644
--- a/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
+++ b/common/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/liquid_null_lake.json
@@ -1,5 +1,5 @@
 {
-  "type": "minecraft:lake",
+  "type": "biomesoplenty:lake",
   "config": {
     "barrier": {
       "type": "minecraft:simple_state_provider",
diff --git a/common/src/main/java/biomesoplenty/worldgen/feature/BOPEndFeatures.java b/common/src/main/java/biomesoplenty/worldgen/feature/BOPEndFeatures.java
index e2d9ecb13..168b13fe9 100644
--- a/common/src/main/java/biomesoplenty/worldgen/feature/BOPEndFeatures.java
+++ b/common/src/main/java/biomesoplenty/worldgen/feature/BOPEndFeatures.java
@@ -61,7 +61,7 @@ public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context)
         register(context, BOPEndFeatures.ENDERPHYTE_BONEMEAL, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.ENDERPHYTE.defaultBlockState())));
         register(context, BOPEndFeatures.FLOWER_END_WILDS, Feature.FLOWER, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.ENDBLOOM))));
         register(context, BOPEndFeatures.JAGGED_SANDSTONE, BOPBaseFeatures.JAGGED_SANDSTONE, NoneFeatureConfiguration.INSTANCE);
-        register(context, BOPEndFeatures.LIQUID_NULL_LAKE, Feature.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(BOPBlocks.LIQUID_NULL), BlockStateProvider.simple(BOPBlocks.NULL_END_STONE)));
+        register(context, BOPEndFeatures.LIQUID_NULL_LAKE, BOPBaseFeatures.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(BOPBlocks.LIQUID_NULL), BlockStateProvider.simple(BOPBlocks.NULL_END_STONE)));
         register(context, BOPEndFeatures.LIQUID_NULL_SPRING, Feature.SPRING, new SpringConfiguration(BOPFluids.LIQUID_NULL.defaultFluidState(), false, 4, 1, HolderSet.direct(Block::builtInRegistryHolder, Blocks.END_STONE, BOPBlocks.NULL_END_STONE, BOPBlocks.UNMAPPED_END_STONE)));
         register(context, BOPEndFeatures.LUMALOOP, BOPBaseFeatures.LUMALOOP, NoneFeatureConfiguration.INSTANCE);
         register(context, BOPEndFeatures.MONOLITH, BOPBaseFeatures.MONOLITH, NoneFeatureConfiguration.INSTANCE);
diff --git a/common/src/main/java/biomesoplenty/worldgen/feature/BOPNetherFeatures.java b/common/src/main/java/biomesoplenty/worldgen/feature/BOPNetherFeatures.java
index e48150d59..f6cc44885 100644
--- a/common/src/main/java/biomesoplenty/worldgen/feature/BOPNetherFeatures.java
+++ b/common/src/main/java/biomesoplenty/worldgen/feature/BOPNetherFeatures.java
@@ -70,7 +70,7 @@ public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context)
 
         register(context, BOPNetherFeatures.BLACKSTONE_BULB, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.BLACKSTONE_BULB))));
         register(context, BOPNetherFeatures.BLACKSTONE_SPINES, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.BLACKSTONE_SPINES))));
-        register(context, BOPNetherFeatures.BLOOD_LAKE, Feature.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(BOPBlocks.BLOOD), BlockStateProvider.simple(BOPBlocks.FLESH)));
+        register(context, BOPNetherFeatures.BLOOD_LAKE, BOPBaseFeatures.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(BOPBlocks.BLOOD), BlockStateProvider.simple(BOPBlocks.FLESH)));
         register(context, BOPNetherFeatures.BLOOD_SPRING, Feature.SPRING, new SpringConfiguration(BOPFluids.BLOOD.defaultFluidState(), false, 4, 1, HolderSet.direct(Block::builtInRegistryHolder, Blocks.NETHERRACK, BOPBlocks.FLESH, BOPBlocks.POROUS_FLESH)));
         register(context, BOPNetherFeatures.BRIMSTONE_BUD, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.BRIMSTONE_BUD))));
         register(context, BOPNetherFeatures.BRIMSTONE_CLUSTER, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.BRIMSTONE_CLUSTER))));
@@ -79,7 +79,7 @@ public static void bootstrap(BootstrapContext<ConfiguredFeature<?, ?>> context)
         register(context, BOPNetherFeatures.FLESH_TENDON, BOPBaseFeatures.FLESH_TENDON, NoneFeatureConfiguration.INSTANCE);
         register(context, BOPNetherFeatures.HAIR, Feature.RANDOM_PATCH, FeatureUtils.simplePatchConfiguration(Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(BlockStateProvider.simple(BOPBlocks.HAIR))));
         register(context, BOPNetherFeatures.HANGING_FLESH_TENDON, BOPBaseFeatures.HANGING_FLESH_TENDON, NoneFeatureConfiguration.INSTANCE);
-        register(context, BOPNetherFeatures.INFERNO_LAVA_LAKE, Feature.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(Blocks.LAVA), BlockStateProvider.simple(BOPBlocks.BRIMSTONE)));
+        register(context, BOPNetherFeatures.INFERNO_LAVA_LAKE, BOPBaseFeatures.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(Blocks.LAVA), BlockStateProvider.simple(BOPBlocks.BRIMSTONE)));
         register(context, BOPNetherFeatures.INFERNO_LAVA_SPRING, Feature.SPRING, new SpringConfiguration(Fluids.LAVA.defaultFluidState(), false, 4, 1, HolderSet.direct(Block::builtInRegistryHolder, Blocks.NETHERRACK)));
         register(context, BOPNetherFeatures.INFERNO_SPLATTER, BOPBaseFeatures.INFERNO_SPLATTER, NoneFeatureConfiguration.INSTANCE);
         register(context, BOPNetherFeatures.LARGE_FUMAROLE, BOPBaseFeatures.LARGE_FUMAROLE, NoneFeatureConfiguration.INSTANCE);