Index: ps/trunk/binaries/data/mods/public/simulation/components/Foundation.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Foundation.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Foundation.js
@@ -409,6 +409,13 @@
 	}
 };
 
+Foundation.prototype.OnEntityRenamed = function(msg)
+{
+	let cmpFoundationNew = Engine.QueryInterface(msg.newentity, IID_Foundation);
+	if (cmpFoundationNew)
+		cmpFoundationNew.AddBuilders(this.GetBuilders());
+};
+
 function FoundationMirage() {}
 FoundationMirage.prototype.Init = function(cmpFoundation)
 {
Index: ps/trunk/binaries/data/mods/public/simulation/components/Repairable.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Repairable.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Repairable.js
@@ -151,6 +151,13 @@
 	return repairTime ? cmpHealth.GetMaxHitpoints() / repairTime : 1;
 };
 
+Repairable.prototype.OnEntityRenamed = function(msg)
+{
+	let cmpRepairableNew = Engine.QueryInterface(msg.newentity, IID_Repairable);
+	if (cmpRepairableNew)
+		cmpRepairableNew.AddBuilders(this.GetBuilders());
+};
+
 function RepairableMirage() {}
 RepairableMirage.prototype.Init = function(cmpRepairable)
 {
Index: ps/trunk/binaries/data/mods/public/simulation/helpers/Transform.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/helpers/Transform.js
+++ ps/trunk/binaries/data/mods/public/simulation/helpers/Transform.js
@@ -72,11 +72,6 @@
 		cmpNewHealth.SetHitpoints(cmpNewHealth.GetMaxHitpoints() * healthLevel);
 	}
 
-	let cmpBuilderList = QueryBuilderListInterface(oldEnt);
-	let cmpNewBuilderList = QueryBuilderListInterface(newEnt);
-	if (cmpBuilderList && cmpNewBuilderList)
-		cmpNewBuilderList.AddBuilders(cmpBuilderList.GetBuilders());
-
 	let cmpPromotion = Engine.QueryInterface(oldEnt, IID_Promotion);
 	let cmpNewPromotion = Engine.QueryInterface(newEnt, IID_Promotion);
 	if (cmpPromotion && cmpNewPromotion)