diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index a7ca8eda63..12efc81211 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -133,7 +133,7 @@
 		InvalidTargets: NoAutoTarget
 	AutoTargetPriority@ATTACKANYTHING:
 		RequiresCondition: stance-attackanything
-		ValidTargets: Infantry, Vehicle, Creep, Water, Structure, Defense
+		ValidTargets: Infantry, Vehicle, Creep, Water, Building, Defense
 		InvalidTargets: NoAutoTarget
 
 ^AutoTargetAir:
@@ -151,7 +151,7 @@
 		InvalidTargets: NoAutoTarget
 	AutoTargetPriority@ATTACKANYTHING:
 		RequiresCondition: stance-attackanything
-		ValidTargets: Infantry, Vehicle, Creep, Water, Air, Structure, Defense
+		ValidTargets: Infantry, Vehicle, Creep, Water, Air, Building, Defense
 		InvalidTargets: NoAutoTarget
 
 ^2x1Shape:
@@ -987,6 +987,8 @@
 		Range: 6c0
 	DetectCloaked:
 		Range: 5c0
+	Targetable:
+		TargetTypes: Ground, Building, C4, Defense
 	RevealOnFire:
 	EditorTilesetFilter:
 		Categories: Defense
diff --git a/mods/ts/rules/gdi-structures.yaml b/mods/ts/rules/gdi-structures.yaml
index 30e046f538..2642133b95 100644
--- a/mods/ts/rules/gdi-structures.yaml
+++ b/mods/ts/rules/gdi-structures.yaml
@@ -36,7 +36,7 @@ GAPOWR:
 		Amount: 100
 	PowerTooltip:
 	Targetable:
-		TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
+		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	ScalePowerWithHealth:
 	Pluggable@pluga:
 		Offset: 0,1
@@ -340,7 +340,7 @@ GARADR:
 		Sequence: idle-dish
 		PauseOnCondition: disabled
 	Targetable:
-		TargetTypes: Ground, C4, SpyInfiltrate
+		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	Power:
 		Amount: -50
 	ProvidesPrerequisite@buildingname:
diff --git a/mods/ts/rules/nod-structures.yaml b/mods/ts/rules/nod-structures.yaml
index d0387ee2aa..7a97c448ef 100644
--- a/mods/ts/rules/nod-structures.yaml
+++ b/mods/ts/rules/nod-structures.yaml
@@ -32,7 +32,7 @@ NAPOWR:
 	Power:
 		Amount: 100
 	Targetable:
-		TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
+		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	ScalePowerWithHealth:
 	PowerTooltip:
 	SelectionDecorations:
@@ -72,7 +72,7 @@ NAAPWR:
 	Power:
 		Amount: 200
 	Targetable:
-		TargetTypes: Ground, C4, DetonateAttack, SpyInfiltrate
+		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	ScalePowerWithHealth:
 	PowerTooltip:
 	SelectionDecorations:
@@ -294,7 +294,7 @@ NARADR:
 		Sequence: idle-dish
 		PauseOnCondition: disabled
 	Targetable:
-		TargetTypes: Ground, C4, SpyInfiltrate
+		TargetTypes: Ground, Building, C4, SpyInfiltrate
 	Power:
 		Amount: -40
 	ProvidesPrerequisite@buildingname: