Well that's Wiki for you!
Sure, if you're intentionally limiting yourself to purely what was seen in TOS then the other references don't apply. Personally I'm so used to thinking of them as one cohe...uh...vague related whole, that it becomes difficult to think of the shows as separate entities.
I suppose the more politically correct term would be "sapient entity in charge of stuff things and wotsernames".
I still stand by the assertion that what we might call a "creature comfort" is to the modern 23rd century Federation citizen what having a knife, fork and plate is to us.
Plus given the fabrication technology at their disposal, it seams giving cargo space over to "useless" items seams very inefficient compared to the more logical practice of storing raw materials in bulk and using them to fabricate whatever as and when it's wanted/needed, with the option to recycle object that are no longer wanted/required.