At this point, I have the following types, with "light, medium, heavy" as options within them:
Derringer
Revolver (light, medium, heavy)
Autoloader (light, medium, heavy)
Machine Pistol (light, heavy)
Rifle (hunting, short sniper, long sniper)
Shotgun (light, medium, heavy, double-barrel, sawed-off)
Submachine Gun
Assault Rifle
Machine Gun (medium, heavy)
Rocket Launcher
Grenade Launcher
I have removed "semi-autos" and there are no longer any "machine guns" in "long arms." Instead, there are submachine guns and assault rifles. Does this jive with the lingo now?