Got the names working properly again. Gotta send the base weapon if it's
a special kind, rather than the stored instant weapon.