Hi 'Nando,
I got used to stick to the definition of - in my mind - one of the best and most knowledgeable firearms historians of the 20th century, and one I learned a lot from: Harold L. Peterson, e.g.
The Book of the Gun (1962 and later editions), which still is one of the best and most readable reference works. Unfortunately, the German version was spoilt by a number of cruel translation errors.
As I said, though, judged by the common dealers' and auction houses' standards, your classification, too, is fine. As a principle, however, I am trying to stick to the roots of each term - as well as to the roots of my arms related education.
Best, though typing with a broken right arm still hurting like hell, right on return from the hospital,
Michl