you do not really need to list the "BAY15D" or "BAY15S" numbers... they are just base type numbers (bayonet bases)... you only need the "P21W" or "P21/5W" designation for example, which are the true trade names
I'm still scratching my head trying to understand why those small wedge bulbs used for the dome lights, parkers, and side indicators are called "T10", etc... the "T" designations have been used for the mini bayonet bulbs in ECE nomenclature (the world standard for automotive lighting)... I understand Australia follows ADR rules and used SAE based standards for lighting, but neither the Japanese, British (both of which used to use similar SAE based standards for lighting), and Americans use such terms (Americans tend to use Osram numbers instead). But the SAE based lighting standards specified in ADR have superseded to ECE standards for at least 20 years already, so.....