either way you can't go wrong since you could convert a D2R bulb to a D2S bulb..
# D2S: Discharge second generation shielded
# D2R: Discharge second generation reflection
so typically D2R's are in reflector type housings as it has a I guess you could say built in shield ... which can be taken off
D2r is on the left and D2S is on the right.. The main difference is the U-shaped masking on the D2R that blocks out unpredictable light in certain directions....so OEM Celicas would be D2S
if you want to really make sure go check to see if your bulb looks like that (above) with the silver/grey markings covering up parts of the bulb.. though it is possible to get it off as well..
but keep your stock ones.. .. 8000k does look great on the car.. but not necessarily on the road