Here's my take on it: I bought an Apple TV and It Just Works. Movies, subtitle, adding a few key apps like Netflix and Youtube. It's the same name because it's the same whole experience.
Obviously not a problem for people who can just buy all the extras but if you're budgeting then it does get quite nasty and lead you to the media server route