Air Gun is fine, it's not a pistol. Long gun is fine too. Air Rifle should have rifling.
Is all a hobby so relax.

I get annoyed when they are called air weapons. It's only a weapon if intended to be used for violent acts, or done violent acts. No one calls a table leg a weapon, though they can be one.