Some weapon name fixes