diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
index 4a11973dee..72531f71f8 100755
--- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
+++ b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
@@ -15,9 +15,9 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.Render
 {
-	class RenderWarFactoryInfo : RenderBuildingInfo
+	class RenderBuildingWarFactoryInfo : RenderBuildingInfo
 	{
-		public override object Create(ActorInitializer init) { return new RenderWarFactory( init, this ); }
+		public override object Create(ActorInitializer init) { return new RenderBuildingWarFactory( init, this ); }
 
         /* get around unverifiability */
         IEnumerable<Renderable> BaseBuildingPreview(ActorInfo building, string tileset)
@@ -37,7 +37,7 @@ namespace OpenRA.Mods.RA.Render
 		}
 	}
 
-	class RenderWarFactory : RenderBuilding, INotifyBuildComplete, ITick, INotifyProduction, INotifySold, ISync
+	class RenderBuildingWarFactory : RenderBuilding, INotifyBuildComplete, ITick, INotifyProduction, INotifySold, ISync
 	{
 		public Animation roof;
 		[Sync]
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.RA.Render
 		[Sync]
 		int2 openExit;
 
-		public RenderWarFactory(ActorInitializer init, RenderBuildingInfo info)
+		public RenderBuildingWarFactory(ActorInitializer init, RenderBuildingInfo info)
 			: base(init, info)
 		{
 			roof = new Animation(GetImage(init.self));
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index dd1fe2dda6..8522d7976a 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -277,7 +277,7 @@ WEAP:
 		Range: 4
 	Bib:
 	-RenderBuilding:
-	RenderWarFactory:
+	RenderBuildingWarFactory:
 	RallyPoint:
 		RallyPoint: 0,3
 	Exit@1:
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index c525c93198..e6ada337ba 100755
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -578,8 +578,8 @@ WEAP:
 	RevealsShroud:
 		Range: 4
 	Bib:
-	RenderWarFactory:
 	-RenderBuilding:
+	RenderBuildingWarFactory:
 	RallyPoint:
 	Exit@1:
 		SpawnOffset: 5,0
@@ -1005,9 +1005,9 @@ WEAF:
 	RevealsShroud:
 		Range: 4
 	Bib:
-	RenderWarFactory:
-		Image: WEAP
 	-RenderBuilding:
+	RenderBuildingWarFactory:
+		Image: WEAP
 	Fake:
 	IronCurtainable:
 	-EmitInfantryOnSell: