diff --git a/OpenRA.Game/Map/TileSet.cs b/OpenRA.Game/Map/TileSet.cs
index 08bed3d29a..b9a10ef656 100644
--- a/OpenRA.Game/Map/TileSet.cs
+++ b/OpenRA.Game/Map/TileSet.cs
@@ -42,7 +42,7 @@ namespace OpenRA
 		public MiniYaml Save() { return FieldSaver.Save(this); }
 	}
 
-	public class TileTemplate
+	public class TerrainTemplateInfo
 	{
 		static readonly string[] Fields = { "Id", "Image", "Frames", "Size", "PickAny", "Category" };
 
@@ -55,14 +55,14 @@ namespace OpenRA
 
 		TerrainTileInfo[] tileInfo;
 
-		public TileTemplate(ushort id, string image, int2 size, byte[] tiles)
+		public TerrainTemplateInfo(ushort id, string image, int2 size, byte[] tiles)
 		{
 			this.Id = id;
 			this.Image = image;
 			this.Size = size;
 		}
 
-		public TileTemplate(TileSet tileSet, MiniYaml my)
+		public TerrainTemplateInfo(TileSet tileSet, MiniYaml my)
 		{
 			FieldLoader.Load(this, my);
 
@@ -157,7 +157,7 @@ namespace OpenRA
 		public readonly string PlayerPalette;
 		public readonly string[] Extensions;
 		public readonly int WaterPaletteRotationBase = 0x60; 
-		public readonly Dictionary<ushort, TileTemplate> Templates = new Dictionary<ushort, TileTemplate>();
+		public readonly Dictionary<ushort, TerrainTemplateInfo> Templates = new Dictionary<ushort, TerrainTemplateInfo>();
 		public readonly string[] EditorTemplateOrder;
 
 		public readonly TerrainTypeInfo[] TerrainInfo;
@@ -194,7 +194,7 @@ namespace OpenRA
 
 			// Templates
 			Templates = yaml["Templates"].ToDictionary().Values
-				.Select(y => new TileTemplate(this, y)).ToDictionary(t => t.Id);
+				.Select(y => new TerrainTemplateInfo(this, y)).ToDictionary(t => t.Id);
 		}
 
 		public TileSet(string name, string id, string palette, string[] extensions, TerrainTypeInfo[] terrainInfo)
diff --git a/OpenRA.Mods.RA/Buildings/LaysTerrain.cs b/OpenRA.Mods.RA/Buildings/LaysTerrain.cs
index ee2450ded2..bc58ad00d2 100755
--- a/OpenRA.Mods.RA/Buildings/LaysTerrain.cs
+++ b/OpenRA.Mods.RA/Buildings/LaysTerrain.cs
@@ -33,7 +33,7 @@ namespace OpenRA.Mods.RA.Buildings
 		readonly LaysTerrainInfo info;
 		readonly BuildableTerrainLayer layer;
 		readonly BuildingInfluence bi;
-		readonly TileTemplate template;
+		readonly TerrainTemplateInfo template;
 
 		public LaysTerrain(Actor self, LaysTerrainInfo info)
 		{
diff --git a/OpenRA.TilesetBuilder/FormBuilder.cs b/OpenRA.TilesetBuilder/FormBuilder.cs
index eb129e0707..b6aaba2c96 100644
--- a/OpenRA.TilesetBuilder/FormBuilder.cs
+++ b/OpenRA.TilesetBuilder/FormBuilder.cs
@@ -393,7 +393,7 @@ namespace OpenRA.TilesetBuilder
 					tiles[idx] = tileset.GetTerrainIndex(ttype);
 				}
 
-				var template = new TileTemplate(
+				var template = new TerrainTemplateInfo(
 					id: cur,
 					image: "{0}{1:00}".F(txtTilesetName.Text, cur),
 					size: new int2(tp.Width, tp.Height),