diff --git a/OpenRA.FileFormats/TileSet.cs b/OpenRA.FileFormats/TileSet.cs
index 6860158ec8..1219bdc384 100644
--- a/OpenRA.FileFormats/TileSet.cs
+++ b/OpenRA.FileFormats/TileSet.cs
@@ -72,7 +72,7 @@ namespace OpenRA.FileFormats
 					string tilename = string.Format(pattern, i + 1);
 
 					if (!walk.ContainsKey((ushort)(start + i)))
-						walk.Add((ushort)(start + i), Walkability.GetTerrainType(tilename));
+						walk.Add((ushort)(start + i), Walkability.GetTileTemplate(tilename));
 
 					using( Stream s = FileSystem.Open( tilename + "." + suffix ) )
 					{
diff --git a/OpenRA.FileFormats/Walkability.cs b/OpenRA.FileFormats/Walkability.cs
index ab62a356b3..9a2235b9fb 100644
--- a/OpenRA.FileFormats/Walkability.cs
+++ b/OpenRA.FileFormats/Walkability.cs
@@ -50,7 +50,7 @@ namespace OpenRA.FileFormats
 	
 	public class Walkability
 	{
-		Dictionary<string, TileTemplate> walkability 
+		Dictionary<string, TileTemplate> templates 
 			= new Dictionary<string,TileTemplate>();
 
 		public Walkability(string templatesFile)
@@ -77,13 +77,13 @@ namespace OpenRA.FileFormats
 				tile.Index = -1;
 				int.TryParse(section.Name.Substring(3), out tile.Index);
 
-				walkability[tile.Name] = tile;
+				templates[tile.Name] = tile;
 			}
 		}
 
-		public TileTemplate GetTerrainType(string terrainName)
+		public TileTemplate GetTileTemplate(string terrainName)
 		{
-			return walkability[terrainName];
+			return templates[terrainName];
 		}
 	}
 }
diff --git a/OpenRA.Game/Traits/Bridge.cs b/OpenRA.Game/Traits/Bridge.cs
index f447e5b257..f9a630a5b8 100644
--- a/OpenRA.Game/Traits/Bridge.cs
+++ b/OpenRA.Game/Traits/Bridge.cs
@@ -97,7 +97,7 @@ namespace OpenRA.Traits
 			var numStates = self.Info.Traits.Get<BridgeInfo>().Long ? 6 : 3;
 			for (var n = 0; n < numStates; n++)
 			{
-				var stateTemplate = world.TileSet.Walkability.GetTerrainType(NameFromState(template, n));
+				var stateTemplate = world.TileSet.Walkability.GetTileTemplate(NameFromState(template, n));
 				Templates.Add( stateTemplate );
 
 				TileSprites.Add(replacedTiles.ToDictionary(