diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 878a5739a3..29ae3b6700 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -516,8 +516,10 @@
 		Name: Field (Destroyed)
 		GenericVisibility: None
 	BodyOrientation:
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	FrozenUnderFog:
 		StartsRevealed: true
 	ScriptTriggers:
@@ -555,8 +557,10 @@
 ^Tree:
 	Tooltip:
 		Name: Tree
-	RenderBuilding:
+	RenderSprites:
 		Palette: staticterrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
@@ -592,8 +596,10 @@
 ^Rock:
 	Tooltip:
 		Name: Rock
-	RenderBuilding:
+	RenderSprites:
 		Palette: staticterrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index be7b4c1471..1aea9b7ef8 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -524,8 +524,10 @@
 ^Tree:
 	Tooltip:
 		Name: Tree
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -621,8 +623,10 @@
 ^Rock:
 	Tooltip:
 		Name: Rock
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: __ x_
 		Dimensions: 2,2
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index e6a0dc285d..28712624ec 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -234,8 +234,10 @@ MINE:
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Ore Mine
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -250,8 +252,10 @@ GMINE:
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Gem Mine
-	RenderBuilding:
+	RenderSprites:
 		Palette: player
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
@@ -267,8 +271,10 @@ RAILMINE:
 	HiddenUnderShroud:
 	Tooltip:
 		Name: Abandoned Mine
-	RenderBuilding:
+	RenderSprites:
 		Palette: player
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
@@ -284,7 +290,9 @@ QUEE:
 	Building:
 		Footprint: xx
 		Dimensions: 2,1
-	RenderBuilding:
+	RenderSprites:
+	WithSpriteBody:
+	AutoSelectionSize:
 	AppearsOnRadar:
 	BodyOrientation:
 	EditorTilesetFilter:
@@ -297,8 +305,10 @@ LAR1:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	AppearsOnRadar:
 	BodyOrientation:
 	EditorTilesetFilter:
@@ -311,8 +321,10 @@ LAR2:
 	Building:
 		Footprint: x
 		Dimensions: 1,1
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	AppearsOnRadar:
 	BodyOrientation:
 	EditorTilesetFilter:
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index aaeec0e5e2..95ec47962d 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -528,8 +528,10 @@
 
 ^Tree:
 	HiddenUnderShroud:
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
@@ -540,8 +542,10 @@
 
 ^Rock:
 	HiddenUnderShroud:
-	RenderBuilding:
+	RenderSprites:
 		Palette: terrain
+	WithSpriteBody:
+	AutoSelectionSize:
 	Building:
 		Footprint: x
 		Dimensions: 1, 1
diff --git a/mods/ts/rules/trees.yaml b/mods/ts/rules/trees.yaml
index 094fe2663f..2edbfcc809 100644
--- a/mods/ts/rules/trees.yaml
+++ b/mods/ts/rules/trees.yaml
@@ -108,6 +108,8 @@ VEINHOLE:
 	AppearsOnRadar:
 	Tooltip:
 		Name: Veinhole
-	RenderBuilding:
+	RenderSprites:
 		Palette: player
+	WithSpriteBody:
+	AutoSelectionSize: