diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/deep.json
similarity index 100%
rename from biomes/ocean/oce-deep.json
rename to biomes/ocean/deep.json
diff --git a/biomes/ocean/oce-ocean.json b/biomes/ocean/ocean.json
similarity index 100%
rename from biomes/ocean/oce-ocean.json
rename to biomes/ocean/ocean.json
diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/shore/beach.json
similarity index 100%
rename from biomes/ocean/oce-beach.json
rename to biomes/ocean/shore/beach.json
diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/warm-bottom.json
similarity index 100%
rename from biomes/ocean/oce-warm-bottom.json
rename to biomes/ocean/warm-bottom.json
diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/warm.json
similarity index 99%
rename from biomes/ocean/oce-warm.json
rename to biomes/ocean/warm.json
index 245c7120..42e49be3 100644
--- a/biomes/ocean/oce-warm.json
+++ b/biomes/ocean/warm.json
@@ -3,7 +3,7 @@
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
     "color": "#2A2180",
-    "children": ["ocean/oce-warm-bottom"],
+    "children": ["ocean/warm-bottom"],
     "generators": [{
         "generator": "plain",
         "max": -10,
diff --git a/biomes/tropical/sea/river-steep.json b/biomes/tropical/sea/river-steep.json
index d998a9cd..5a812e47 100644
--- a/biomes/tropical/sea/river-steep.json
+++ b/biomes/tropical/sea/river-steep.json
@@ -91,7 +91,7 @@
             ]
         },
         {
-            "place": ["landform/underwater/ellipsoid-1"],
+            "place": ["clutter/ellipsoid1"],
             "chance": 0.5,
             "underwater": true,
             "mode": "CENTER_HEIGHT",
diff --git a/biomes/tundra/bonsai-forest.json b/biomes/tundra/bonsai-forest.json
index 502ec78a..e751d8bc 100644
--- a/biomes/tundra/bonsai-forest.json
+++ b/biomes/tundra/bonsai-forest.json
@@ -162,11 +162,10 @@
                 "enabled": true
             },
             "place": [
-                "sacred-bonsai/med-1",
-                "sacred-bonsai/med-2",
-                "sacred-bonsai/med-3",
-                "sacred-bonsai/med-4",
-                "sacred-bonsai/med-5"
+                "trees/bonsai/med-1",
+                "trees/bonsai/med-2",
+                "trees/bonsai/med-3",
+                "trees/bonsai/med-4"
             ],
             "translate": {
                 "x": 0,
diff --git a/objects/clutter/ellipsoid1.iob b/objects/clutter/ellipsoid1.iob
new file mode 100644
index 00000000..53f3b2cf
Binary files /dev/null and b/objects/clutter/ellipsoid1.iob differ
diff --git a/regions/temperate.json b/regions/temperate.json
index 6baeca24..833f00d8 100644
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -19,7 +19,7 @@
     ],
     "seaBiomes": [
         "temperate/sea/river",
-        "ocean/oce-deep"
+        "ocean/deep"
     ],
     "caveBiomes": [
         "cave/old-cavern",