Index: ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Formation.js
@@ -1004,7 +1004,7 @@
 	else
 		cmpNewUnitAI.MoveIntoFormation();
 
-	Engine.BroadcastMessage(MT_EntityRenamed, {"entity": this.entity, "newentity": newFormation});
+	Engine.PostMessage(this.entity, MT_EntityRenamed, { "entity": this.entity, "newentity": newFormation });
 };
 
 Engine.RegisterComponentType(IID_Formation, "Formation", Formation);
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
@@ -412,7 +412,7 @@
 
 		Engine.PostMessage(this.entity, MT_ConstructionFinished,
 			{ "entity": this.entity, "newentity": building });
-		Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: building });
+		Engine.PostMessage(this.entity, MT_EntityRenamed, { "entity": this.entity, "newentity": building });
 
 		Engine.DestroyEntity(this.entity);
 	}
Index: ps/trunk/binaries/data/mods/public/simulation/components/Health.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Health.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Health.js
@@ -240,7 +240,7 @@
 			{
 				let resource = this.CreateCorpse(true);
 				if (resource != INVALID_ENTITY)
-					Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: resource });
+					Engine.PostMessage(this.entity, MT_EntityRenamed, { "entity": this.entity, "newentity": resource });
 			}
 
 			case "vanish":
Index: ps/trunk/binaries/data/mods/public/simulation/components/Mirage.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Mirage.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Mirage.js
@@ -206,7 +206,7 @@
 	if (this.parent == INVALID_ENTITY)
 		Engine.DestroyEntity(this.entity);
 	else
-		Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: this.parent });
+		Engine.PostMessage(this.entity, MT_EntityRenamed, { "entity": this.entity, "newentity": this.parent });
 };
 
 Engine.RegisterComponentType(IID_Mirage, "Mirage", Mirage);
Index: ps/trunk/binaries/data/mods/public/simulation/components/Promotion.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Promotion.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Promotion.js
@@ -120,7 +120,7 @@
 		}
 	}
 
-	Engine.BroadcastMessage(MT_EntityRenamed, { entity: this.entity, newentity: promotedUnitEntity });
+	Engine.PostMessage(this.entity, MT_EntityRenamed, { "entity": this.entity, "newentity": promotedUnitEntity });
 
 	// Destroy current entity
 	Engine.DestroyEntity(this.entity);
Index: ps/trunk/binaries/data/mods/public/simulation/components/SkirmishReplacer.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/SkirmishReplacer.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/SkirmishReplacer.js
@@ -71,7 +71,7 @@
 	var cmpReplacementOwnership = Engine.QueryInterface(replacement, IID_Ownership);
 	cmpReplacementOwnership.SetOwner(cmpCurOwnership.GetOwner());
 
-	Engine.BroadcastMessage(MT_EntityRenamed, { "entity": this.entity, "newentity": replacement });
+	Engine.PostMessage(this.entity, MT_EntityRenamed, { "entity": this.entity, "newentity": replacement });
 	Engine.DestroyEntity(this.entity);
 };
 
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
@@ -95,7 +95,7 @@
 
 	TransferGarrisonedUnits(oldEnt, newEnt);
 
-	Engine.BroadcastMessage(MT_EntityRenamed, { "entity": oldEnt, "newentity": newEnt });
+	Engine.PostMessage(oldEnt, MT_EntityRenamed, { "entity": oldEnt, "newentity": newEnt });
 
 	Engine.DestroyEntity(oldEnt);