Fix Armor/Naming