diff --git a/biomes/frozen-beach.json b/biomes/frozen-beach.json
index 8eb411c9..558fce27 100644
--- a/biomes/frozen-beach.json
+++ b/biomes/frozen-beach.json
@@ -1,5 +1,39 @@
 {
+    "name": "Frozen Beach",
+    "derivative": "SNOWY_BEACH",
     "vanillaDerivative": "SNOWY_BEACH",
+    "layers": [
+        {
+            "minHeight": 2,
+            "maxHeight": 3,
+            "palette": [
+                {
+                    "block": "snow_block"
+                }
+            ]
+        },
+        {
+            "minHeight": 3,
+            "maxHeight": 5,
+            "palette": [
+                {
+                    "block": "dirt"
+                }
+            ]
+        }
+    ],
+    "generators": [
+        {
+            "min": -5,
+            "max": 1,
+            "generator": "plain"
+        }
+    ],
+    "loot": {
+        "tables": [
+            "beach-clutter"
+        ]
+    },
     "seaLayers": [
         {
             "minHeight": 1,
@@ -134,40 +168,6 @@
             }
         }
     ],
-    "name": "Frozen Beach",
-    "layers": [
-        {
-            "minHeight": 2,
-            "maxHeight": 3,
-            "palette": [
-                {
-                    "block": "snow_block"
-                }
-            ]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 5,
-            "palette": [
-                {
-                    "block": "dirt"
-                }
-            ]
-        }
-    ],
-    "generators": [
-        {
-            "min": -5,
-            "max": 1,
-            "generator": "plain"
-        }
-    ],
-    "loot": {
-        "tables": [
-            "beach-clutter"
-        ]
-    },
-    "derivative": "SNOWY_BEACH",
     "slab": {
         "style": {
             "style": "STATIC"
diff --git a/biomes/frozen-hills.json b/biomes/frozen-hills.json
index 7ced4741..5cd06b7c 100644
--- a/biomes/frozen-hills.json
+++ b/biomes/frozen-hills.json
@@ -2,7 +2,44 @@
     "name": "Frozen Hills",
     "derivative": "SNOWY_TAIGA",
     "vanillaDerivative": "SNOWY_TAIGA",
-    "rarity": 3,
+    "layers": [
+        {
+            "minHeight": 3,
+            "maxHeight": 5,
+            "palette": [
+                {
+                    "block": "snow_block"
+                }
+            ]
+        },
+        {
+            "minHeight": 3,
+            "maxHeight": 5,
+            "palette": [
+                {
+                    "block": "dirt"
+                }
+            ]
+        },
+        {
+            "minHeight": 6,
+            "maxHeight": 18,
+            "style": {
+                "style": "STATIC"
+            },
+            "palette": [
+                {
+                    "block": "stone"
+                },
+                {
+                    "block": "andesite"
+                },
+                {
+                    "block": "stone"
+                }
+            ]
+        }
+    ],
     "generators": [
         {
             "generator": "plain",
@@ -136,44 +173,6 @@
             ]
         }
     ],
-    "layers": [
-        {
-            "minHeight": 3,
-            "maxHeight": 5,
-            "palette": [
-                {
-                    "block": "snow_block"
-                }
-            ]
-        },
-        {
-            "minHeight": 3,
-            "maxHeight": 5,
-            "palette": [
-                {
-                    "block": "dirt"
-                }
-            ]
-        },
-        {
-            "minHeight": 6,
-            "maxHeight": 18,
-            "style": {
-                "style": "STATIC"
-            },
-            "palette": [
-                {
-                    "block": "stone"
-                },
-                {
-                    "block": "andesite"
-                },
-                {
-                    "block": "stone"
-                }
-            ]
-        }
-    ],
     "wall": {
         "palette": [
             {
diff --git a/biomes/frozen-ice-cavern.json b/biomes/frozen-ice-cavern.json
index aeb6de11..c82cb58d 100644
--- a/biomes/frozen-ice-cavern.json
+++ b/biomes/frozen-ice-cavern.json
@@ -1,45 +1,7 @@
 {
-    "entitySpawnOverrides": [
-        {
-            "trigger": "SKELETON",
-            "entity": "shroud",
-            "cancelSourceSpawn": true,
-            "rarity": 12
-        }
-    ],
-    "decorators": [
-        {
-            "chance": 0.01,
-            "variance": {
-                "style": "STATIC"
-            },
-            "zoom": 0.3,
-            "palette": [
-                {
-                    "block": "cornflower"
-                }
-            ],
-            "style": {
-                "style": "STATIC"
-            }
-        },
-        {
-            "chance": 0.001,
-            "variance": {
-                "style": "STATIC"
-            },
-            "zoom": 0.3,
-            "palette": [
-                {
-                    "block": "blackstone_wall"
-                }
-            ],
-            "style": {
-                "style": "STATIC"
-            }
-        }
-    ],
-    "name": "Frozen Cavern",
+    "name": "Frozen Ice Cavern",
+    "derivative": "FROZEN_OCEAN",
+    "vanillaDerivative": "FROZEN_OCEAN",
     "layers": [
         {
             "minHeight": 1,
@@ -92,12 +54,51 @@
             "generator": "plain"
         }
     ],
+    "entitySpawnOverrides": [
+        {
+            "trigger": "SKELETON",
+            "entity": "shroud",
+            "cancelSourceSpawn": true,
+            "rarity": 12
+        }
+    ],
+    "decorators": [
+        {
+            "chance": 0.01,
+            "variance": {
+                "style": "STATIC"
+            },
+            "zoom": 0.3,
+            "palette": [
+                {
+                    "block": "cornflower"
+                }
+            ],
+            "style": {
+                "style": "STATIC"
+            }
+        },
+        {
+            "chance": 0.001,
+            "variance": {
+                "style": "STATIC"
+            },
+            "zoom": 0.3,
+            "palette": [
+                {
+                    "block": "blackstone_wall"
+                }
+            ],
+            "style": {
+                "style": "STATIC"
+            }
+        }
+    ],
     "loot": {
         "tables": [
             "cave-clutter"
         ]
     },
-    "derivative": "FROZEN_OCEAN",
     "slab": {
         "style": {
             "style": "IRIS"