Minor Improvements To Name And Weapon

Made the "Weapon" class use a "Name" object.  Minor improvements to the
"Name" class.