Renamed weapontype to weapon