Weapons fix

Weapons names now align with specification