Well AFAIC it's always been a light, lamp, luminaire or fitting and the thing inside that gets white hot is a bulb or tube. 40 years ago nobody would have understood what was wanted if they were asked for a 40W lamp.I remember ordering a head lamp, and that is what I got, minus the bulb.
Historically the lamp fitted on a spigot and in the lamp you had wick or mantel and these were replaced with a bulbous bit of glass with a filament inside. Later we had fluorescent tubes and other shapes of blown glass, but lighting industry has a habit of calling new items after what they replace, so bulb it is, even if no longer bulbous.
Same goes for ballast, transformer, and many other devices.
Ask for a lamp holder and it would have been a ring on a bracket that the oil lamp hung in.