Shoulder Bursitis Cure?!

Im a weight lifter and i have bursitis in my left shoulder. i have been resting it for several weeks as well as applying ice to it once or twice a day. the thing is, it really isnt bad, its not painful at all but its more just uncomfortable in certain positions when im weightlifting or leaning on that arm.
What i want to know is how can i fix it, because rest doesnt seem to be fixing it beyond this point, should i just go ahead and get the steroid injection?

Also another question. my doctor said to me steroid injection, but everyone else says cortisone injection, is their any difference?

Thanks.