diff --git a/mods/ra/maps/allies-01-classic/map.yaml b/mods/ra/maps/allies-01-classic/map.yaml
index bc9dc59bfb..136ba75532 100644
--- a/mods/ra/maps/allies-01-classic/map.yaml
+++ b/mods/ra/maps/allies-01-classic/map.yaml
@@ -604,6 +604,42 @@ Rules:
 	EINSTEIN:
 		Passenger:
 			CargoType: Einstein
+	^Vehicle:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
 	^CivInfantry:
 		RevealsShroud:
 			Range: 0c0
diff --git a/mods/ra/maps/allies-02-classic/map.yaml b/mods/ra/maps/allies-02-classic/map.yaml
index be5e9ca389..b96f01489c 100644
--- a/mods/ra/maps/allies-02-classic/map.yaml
+++ b/mods/ra/maps/allies-02-classic/map.yaml
@@ -879,12 +879,45 @@ Rules:
 			LuaScripts: allies02.lua
 		ObjectivesPanel:
 			PanelName: MISSION_OBJECTIVES
-	^Infantry:
-		MustBeDestroyed:
-	^Tank:
-		MustBeDestroyed:
 	^Vehicle:
 		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Tank:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Infantry:
+		MustBeDestroyed:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Ship:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Plane:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Helicopter:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Building:
+		Tooltip:
+			GenericVisibility: Enemy
+			ShowOwnerRow: false
+	^Wall:
+		Tooltip:
+			ShowOwnerRow: false
+	^Husk:
+		Tooltip:
+			GenericVisibility: Enemy, Ally, Neutral
+			GenericStancePrefix: false
+			ShowOwnerRow: false
 	APWR:
 		Buildable:
 			Prerequisites: ~disabled
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 7771b9f1f4..6cd9c3238e 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -38,6 +38,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Vehicle
 	EjectOnDeath:
 		PilotActor: e1
 		SuccessRate: 20
@@ -101,6 +103,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Tank
 	EjectOnDeath:
 		PilotActor: e1
 		SuccessRate: 20
@@ -171,6 +175,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Soldier
 	SelfHealing@HOSPITAL:
 		Step: 5
 		Ticks: 100
@@ -237,6 +243,8 @@
 	Guard:
 	Guardable:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Ship
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
@@ -280,6 +288,8 @@
 	UpdatesPlayerStatistics:
 	CombatDebugOverlay:
 	BodyOrientation:
+	Tooltip:
+		GenericName: Plane
 	Huntable:
 	LuaScriptEvents:
 	ScriptTriggers:
@@ -293,6 +303,8 @@
 
 ^Helicopter:
 	Inherits: ^Plane
+	Tooltip:
+		GenericName: Helicopter
 	GpsDot:
 		String: Helicopter
 
@@ -339,6 +351,8 @@
 		Range: 3
 	BodyOrientation:
 	FrozenUnderFog:
+	Tooltip:
+		GenericName: Structure
 	GpsDot:
 		String: Structure
 	Huntable:
@@ -400,6 +414,7 @@
 		Type: Wood
 	Tooltip:
 		Name: Civilian Building
+		GenericVisibility: None
 	ProximityCaptor:
 		Types: CivilianBuilding
 	-WithMakeAnimation:
@@ -438,6 +453,7 @@
 		Cost: 70
 	Tooltip:
 		Name: Civilian
+		GenericVisibility: None
 	Health:
 		HP: 20
 	Mobile:
@@ -517,6 +533,8 @@
 	TargetableUnit:
 		TargetTypes: Ground
 		RequiresForceFire: true
+	Tooltip:
+		GenericName: Destroyed Vehicle
 	AutoTargetIgnore:
 	Capturable:
 		Type: husk
diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml
index 635b27ff44..2e3ded06af 100644
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -245,6 +245,7 @@ HARV:
 		Cost: 1100
 	Tooltip:
 		Name: Ore Truck
+		GenericName: Harvester
 		Description: Collects Ore and Gems for processing.\n  Unarmed
 	Selectable:
 		Priority: 7