diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index ab3f66453e..93aaa12c61 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -491,14 +491,14 @@
     <Compile Include="Traits\Transforms.cs" />
     <Compile Include="Traits\Turreted.cs" />
     <Compile Include="Traits\ProducibleWithLevel.cs" />
-    <Compile Include="Traits\Upgrades\GrantConditionOnDeploy.cs" />
-    <Compile Include="Traits\Upgrades\DisableOnCondition.cs" />
-    <Compile Include="Traits\Upgrades\ConditionalTrait.cs" />
-    <Compile Include="Traits\Upgrades\ProximityExternalCondition.cs" />
-    <Compile Include="Traits\Upgrades\GrantConditionOnDamageState.cs" />
-    <Compile Include="Traits\Upgrades\GrantConditionOnTerrain.cs" />
-    <Compile Include="Traits\Upgrades\GrantConditionOnMovement.cs" />
-    <Compile Include="Traits\Upgrades\ConditionManager.cs" />
+    <Compile Include="Traits\Conditions\GrantConditionOnDeploy.cs" />
+    <Compile Include="Traits\Conditions\DisableOnCondition.cs" />
+    <Compile Include="Traits\Conditions\ConditionalTrait.cs" />
+    <Compile Include="Traits\Conditions\ProximityExternalCondition.cs" />
+    <Compile Include="Traits\Conditions\GrantConditionOnDamageState.cs" />
+    <Compile Include="Traits\Conditions\GrantConditionOnTerrain.cs" />
+    <Compile Include="Traits\Conditions\GrantConditionOnMovement.cs" />
+    <Compile Include="Traits\Conditions\ConditionManager.cs" />
     <Compile Include="Traits\Valued.cs" />
     <Compile Include="Traits\Voiced.cs" />
     <Compile Include="Traits\Wanders.cs" />
@@ -772,9 +772,9 @@
     <Compile Include="Traits\AutoCarryable.cs" />
     <Compile Include="Traits\AutoCarryall.cs" />
     <Compile Include="Traits\World\CliffBackImpassabilityLayer.cs" />
-    <Compile Include="Traits\Upgrades\GrantCondition.cs" />
-    <Compile Include="Traits\Upgrades\ExternalConditions.cs" />
-    <Compile Include="Traits\Upgrades\StackedCondition.cs" />
+    <Compile Include="Traits\Conditions\GrantCondition.cs" />
+    <Compile Include="Traits\Conditions\ExternalConditions.cs" />
+    <Compile Include="Traits\Conditions\StackedCondition.cs" />
     <Compile Include="Traits\Buildings\BridgeHut.cs" />
     <Compile Include="Traits\Buildings\BridgePlaceholder.cs" />
     <Compile Include="Traits\Buildings\GroundLevelBridge.cs" />
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/ConditionManager.cs b/OpenRA.Mods.Common/Traits/Conditions/ConditionManager.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/ConditionManager.cs
rename to OpenRA.Mods.Common/Traits/Conditions/ConditionManager.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/ConditionalTrait.cs b/OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/ConditionalTrait.cs
rename to OpenRA.Mods.Common/Traits/Conditions/ConditionalTrait.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/DisableOnCondition.cs b/OpenRA.Mods.Common/Traits/Conditions/DisableOnCondition.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/DisableOnCondition.cs
rename to OpenRA.Mods.Common/Traits/Conditions/DisableOnCondition.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/ExternalConditions.cs b/OpenRA.Mods.Common/Traits/Conditions/ExternalConditions.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/ExternalConditions.cs
rename to OpenRA.Mods.Common/Traits/Conditions/ExternalConditions.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantCondition.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/GrantCondition.cs
rename to OpenRA.Mods.Common/Traits/Conditions/GrantCondition.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDamageState.cs
rename to OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDamageState.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnDeploy.cs
rename to OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnDeploy.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnMovement.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnMovement.cs
rename to OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnMovement.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs b/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnTerrain.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/GrantConditionOnTerrain.cs
rename to OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnTerrain.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs b/OpenRA.Mods.Common/Traits/Conditions/ProximityExternalCondition.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/ProximityExternalCondition.cs
rename to OpenRA.Mods.Common/Traits/Conditions/ProximityExternalCondition.cs
diff --git a/OpenRA.Mods.Common/Traits/Upgrades/StackedCondition.cs b/OpenRA.Mods.Common/Traits/Conditions/StackedCondition.cs
similarity index 100%
rename from OpenRA.Mods.Common/Traits/Upgrades/StackedCondition.cs
rename to OpenRA.Mods.Common/Traits/Conditions/StackedCondition.cs