I was wondering if we should make famicom a synonym of nes. I ask this because essentially the hardware is identical, the major difference being that the plastic cartridges are keyed differently so one won't fit in the other.
As an aside, I should point out that famicom-disk-system is a hardware add-on, and thus definitely merits a separate tag if that should come up.