There's a whole lot of mixing-up and bastardization in the various conversions, starting with 1e-2e, and continuing to now.
I don't really know what WotC is trying to do with the names now. They have a listing in the MM for "Demon" which includes a bunch of creatures, most of them Tanar'ri, but...