Domains at War: Troop Type v. Movement Type

Domains at War relies on the concept of “troop type” for recruiting mercenaries, training conscripts, and so on. Troop types include heavy infantry, slingers, longbowmen, heavy cavalry, and so on.
Domains at War relies on the concept of “movement type” to define how mobile a unit is on the battlefield. Movement types include Heavy Infantry (HI), Light Infantry (LI), Heavy Cavalry (HC), and so on.
The troop types and movement types overlap to a large degree. Heavy cavalry troop type is also Heavy Cavalry movement type. Light infantry troop type is Light Infantry movement type.
However, there are some troop types that don’t have their own movement type. For example, slingers and bowmen are both LI (Light Infantry) movement type. Medium cavalry troops are Heavy Cavalry movement type. This creates the possibility of confusion.
One way around this would be to create new names for the movement types, such as “Skirmisher” “Slow Foot” and so on.
My question is, what do you prefer:

  1. A “common sense” naming scheme where light cavalry move as Light Cavalry and heavy infantry move as Heavy Infantry, even though this means that there are results like medium cavalry move as Heavy Cavalry
  2. A “zero ambiguity” naming scheme where light cavalry move as Fast Mounted and heavy infantry move as Slow Foot even though this means you have to learn two labels for all the common unit types