I would make a suggestion, as per Asai Nagamasa, to call the original Sword Dojo the Tea House, and the S2TW forum the Sword Dojo.

Even vice versa would be nice....................