User blog comment:ZTH-Yankee/Weapon names changed during the merge/@comment-7395018-20150825195853

I have changed the page names.

Keep this list updated and I'll change them as necessary.