Changing Proficiency Groups?

[TCArknight]

The dataset I’m working on classifies weapons, armor, tools and gear as Basic, Advanced, Improvised, etc. instead of just Simple or Martial (or Special).

1) If I create a tag group of EquipmentCat.xxx, what would be the best way to give the proficiency on that item to the hero?

2) Rather than creating a ArmProfGrp.WepBasic, ArmorBasic, etc. is there a way to display the proficiencies as “Equipment: Basic, Advanced” instead of “Weapons: Basic Weapons, Advanced Weapons
Armor: Basic Armor, Advanced Armor” on the Class tab and descriptions?

Thanks!
TC