I'm pretty sure I know the answer to this but am interested to find out if i am correct

In my personal cataloging method I have put my new G2 Bruitics under the following catagories:


Name, Allegiance, Toyline, Series, Transformation
Brawl, Combaticon, G2, FOC, Cybetronian Tank
Swindle, Combaticon, G2, FOC, Cybertronian Armored Truck
Blast Off, Combaticon, G2, FOC, Cybertronian Shuttle
Vortex, Combaticon, G2, FOC, Cybertronian Helicopter
Onslaught, Combaticon, G2, FOC, Cybertronian Missile Truck

So it counts as 5 for me



But if I'm guessing right according to the universal counting method it would be:


Name, Allegiance, Toyline,
Bruiticus, Decepticon Super Warrior, G2


So it would only count as 1. Am I right?