East Asian history

Which pairing correctly distinguishes two major Tokugawa-era cities?