Gion remains dotted with old-style Japanese houses called ochaya...
Not every business in an old-style house is an ochaya. The classic wooden row-houses are collectively called machinami ("city rows"), and the individual unit is a machiya ("city house").