Which units belong to the Zerg from Starcraft

In Brood War-
Queen
Larvae
Drone
Zergling
Hydralisk
Lurker
Overlord
Mutalisk
Scourges
Guardian
Devourer
Defiler
Ultralisk
Infested Terran
Starcraft2: Wings of Liberty-

Queen
Larvae
Drone
Zergling
Banelings
Roach
Hydralisk
Overlord
Overseer
Infester
Mutalisk
Corrupters
Broodlords
Ultralisk
Infested Terran

I may have missed some but I am pretty sure this is all of them.