I did get the proper lights. The store near me carries Sylvania and I had some trouble finding the correct number. When I did I noticed they are OSRAM made in Germany rather than whatever else they carry which was all made in Taiwan.
I also got a couple of the courtesy lights and interior lights replaced. I now have extras of just about every bulb on the car so should be good for a while.