Bring Equipment Naming to use proper name
Finish Adding Class Abilities.