Ah, misread. Still, far too generalized, and the existence of Automatics as a sort of jack-of-all-trades option is definitely a good thing.
Specific is better.
I still think each weapon type should be its own skill with some exceptions.
Basically:
Pistols (hold-out, light and heavy) [include a narco-ject firing pistol here]
Submachine Guns (SMGs and machine pistols)
Rifles (sport and sniper rifles) [include a narco-ject firing rifle here]
Machine Guns (assault rifles, LMG, MMG, HMG)
Heavy Weapons (assault cannons, grenade launchers, rocket launchers, mini-guns)
Laser Weapons