Indeed, there are 2 types. I think I have one of the other (bulb) type hanging around somewhere. The notches are different and the centre-locking ring is bigger in diameter from memory.
Keep us all posted and I'll have a root around if your shiny new ones are wrong.