diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index 8191422675..739f50166a 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -144,7 +144,7 @@ ORCAB:
 		Ammo: 10
 		PipCount: 2
 		ReloadCount: 5
-		ReloadTicks: 200
+		ReloadDelay: 200
 		PipType: Ammo
 		PipTypeEmpty: AmmoEmpty
 	AutoTarget:
diff --git a/mods/ts/rules/civilian-vehicles.yaml b/mods/ts/rules/civilian-vehicles.yaml
index b8e2437060..2df93e87e7 100644
--- a/mods/ts/rules/civilian-vehicles.yaml
+++ b/mods/ts/rules/civilian-vehicles.yaml
@@ -27,7 +27,7 @@
 		Voice: Attack
 	AutoTarget:
 	SelfHealing:
-		Ticks: 10
+		Delay: 10
 		HealIfBelow: 50%
 		DamageCooldown: 200
 	WithVoxelTurret:
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index e089fbcb2d..8a964c00e9 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -34,7 +34,7 @@
 		Modifier: 90, 75
 	SelfHealing@ELITE:
 		Step: 2
-		Ticks: 100
+		Delay: 100
 		HealIfBelow: 1
 		DamageCooldown: 125
 		UpgradeTypes: selfheal
@@ -317,7 +317,7 @@
 		DeathTypes: EnergyDeath
 	SelfHealing@HOSPITAL:
 		Step: 5
-		Ticks: 100
+		Delay: 100
 		HealIfBelow: 1
 		DamageCooldown: 125
 		UpgradeTypes: hospitalheal
diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml
index dfc6e2841e..46798d20cd 100644
--- a/mods/ts/rules/gdi-infantry.yaml
+++ b/mods/ts/rules/gdi-infantry.yaml
@@ -55,7 +55,7 @@ MEDIC:
 	WithInfantryBody:
 		AttackSequence: heal
 	SelfHealing:
-		Ticks: 60
+		Delay: 60
 	Passenger:
 		PipType: Red
 
diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml
index c7915d46c2..35b35e49b9 100644
--- a/mods/ts/rules/nod-vehicles.yaml
+++ b/mods/ts/rules/nod-vehicles.yaml
@@ -233,8 +233,8 @@ WEED:
 		DeliveryBuildings: nawast
 		Capacity: 7
 		Resources: Veins
-		UnloadTicksPerBale: 20
-		LoadTicksPerBale: 40
+		BaleUnloadDelay: 20
+		BaleLoadDelay: 40
 		SearchFromProcRadius: 72
 		SearchFromOrderRadius: 36
 		HarvestVoice: Attack
@@ -245,7 +245,7 @@ WEED:
 	Health:
 		HP: 600
 	SelfHealing:
-		Ticks: 10
+		Delay: 10
 		HealIfBelow: 50%
 		DamageCooldown: 200
 	Armor:
diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml
index 528bb3a536..b4d8151f66 100644
--- a/mods/ts/rules/shared-vehicles.yaml
+++ b/mods/ts/rules/shared-vehicles.yaml
@@ -56,7 +56,7 @@ HARV:
 		DeliveryBuildings: proc
 		Capacity: 28
 		Resources: Tiberium, BlueTiberium
-		UnloadTicksPerBale: 1
+		BaleUnloadDelay: 1
 		SearchFromProcRadius: 36
 		SearchFromOrderRadius: 18
 		HarvestVoice: Attack
@@ -75,7 +75,7 @@ HARV:
 	Health:
 		HP: 1000
 	SelfHealing:
-		Ticks: 10
+		Delay: 10
 		HealIfBelow: 50%
 		DamageCooldown: 200
 	Armor: