diff --git a/binaries/data/mods/public/gui/session/selection.js b/binaries/data/mods/public/gui/session/selection.js
index 9f1a976e65..276e2ac6d2 100644
--- a/binaries/data/mods/public/gui/session/selection.js
+++ b/binaries/data/mods/public/gui/session/selection.js
@@ -35,9 +35,9 @@ function _setMotionOverlay(ents, enabled, motionDebugOverlay, force = false)
 	{
 		resultSet.add(ent);
 		const entState = GetEntityState(ent);
-		if (entState?.unitAI?.formation)
+		if (entState?.unitAI?.formationController)
 		{
-			resultSet.add(entState.unitAI.formation);
+			resultSet.add(entState.unitAI.formationController);
 		}
 	}
 
@@ -519,8 +519,8 @@ EntitySelection.prototype.addFormationMembers = function(entities)
 	for (const entity of entities)
 	{
 		const entState = GetEntityState(+entity);
-		if (entState?.unitAI?.formation)
-			for (const member of GetEntityState(+entState.unitAI.formation).formation.members)
+		if (entState?.unitAI?.formationController)
+			for (const member of GetEntityState(+entState.unitAI.formationController).formation.members)
 				result.add(member);
 	}
 
diff --git a/binaries/data/mods/public/simulation/components/tests/test_EntityStates.js b/binaries/data/mods/public/simulation/components/tests/test_EntityStates.js
index a790d2c1c6..48728886a2 100644
--- a/binaries/data/mods/public/simulation/components/tests/test_EntityStates.js
+++ b/binaries/data/mods/public/simulation/components/tests/test_EntityStates.js
@@ -599,7 +599,7 @@ const expectedDynamicStates = {
 			"hasWorkOrders": true,
 			"isGuarding": false,
 			"isIdle": true,
-			"formation": FORMATION_CONTROLLER_ENT_ID
+			"formationController": FORMATION_CONTROLLER_ENT_ID
 		},
 		"visibility": "visible"
 	},
@@ -622,7 +622,7 @@ const expectedDynamicStates = {
 			"hasWorkOrders": true,
 			"isGuarding": false,
 			"isIdle": true,
-			"formation": FORMATION_CONTROLLER_ENT_ID
+			"formationController": FORMATION_CONTROLLER_ENT_ID
 		},
 		"visibility": "visible"
 	}
diff --git a/binaries/data/mods/public/simulation/helpers/EntityStateRetriever.js b/binaries/data/mods/public/simulation/helpers/EntityStateRetriever.js
index f778ea82d8..7c11db9896 100644
--- a/binaries/data/mods/public/simulation/helpers/EntityStateRetriever.js
+++ b/binaries/data/mods/public/simulation/helpers/EntityStateRetriever.js
@@ -318,7 +318,7 @@ class EntityStateRetriever
 				"hasWorkOrders": cmpUnitAI.HasWorkOrders(),
 				"isGuarding": cmpUnitAI.IsGuardOf(),
 				"isIdle": cmpUnitAI.IsIdle(),
-				"formation": cmpUnitAI.GetFormationController()
+				"formationController": cmpUnitAI.GetFormationController()
 			};
 
 		const cmpUpgrade = Engine.QueryInterface(ent, IID_Upgrade);