"Final" Commit

Everything should be in working order!
Remove weapon class from names.